Commits · 31d57a21de199d46230a432e7cda138c7aed2d54 · nexedi / gitlab-ce

15 Aug, 2018 21 commits
- Merge branch '7244-snowplow-is-not-loading-correctly-sp-js' into 'master' · 31d57a21
  Mike Greiling authored Aug 15, 2018
```
Resolve "Snowplow is not loading correctly (sp.js)"

Closes #7244

See merge request gitlab-org/gitlab-ee!6899
```
  31d57a21
- Merge branch 'license' into 'master' · 885097de
  Robert Speicher authored Aug 15, 2018
```
Add instance-level license template

Closes #5986

See merge request gitlab-org/gitlab-ee!6631
```
  885097de
- Add instance-level license template · a6bddf15
  Daniel Barker authored Aug 15, 2018
  
  a6bddf15
- Merge branch '5811-add-maven-support-to-our-artifact-repository-mvc' into 'master' · 087673ac
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Adds support to upload and download maven packages from/to GitLab

Closes #5811

See merge request gitlab-org/gitlab-ee!6607
```
  087673ac
- Merge branch 'ce-to-ee-2018-08-15' into 'master' · d17e480b
  Robert Speicher authored Aug 15, 2018
```
CE upstream - 2018-08-15 00:22 UTC

See merge request gitlab-org/gitlab-ee!6898
```
  d17e480b
- Fix conflict in common.scss · 5bf9465c
  Annabel Dunstone Gray authored Aug 15, 2018
  
  5bf9465c
- Update schema.rb to represent column order from packages migrations · 3b0f7851
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3b0f7851
- Merge branch '7194-add-documentation-for-sli-alerts' into 'master' · 46215bdc
  Marcia Ramos authored Aug 15, 2018
```
Add documentation for SLI alerts

Closes #7194

See merge request gitlab-org/gitlab-ee!6861
```
  46215bdc
- Add documentation for SLI alerts · 7c5b29ef
  Joshua Lambert authored Aug 15, 2018
  
  7c5b29ef
- Merge branch 'docs-junit-test-reports-ee' into 'master' · 46e53a17
  Marcia Ramos authored Aug 15, 2018
```
Documentation for JUnit XML Test Summary In MR widget

See merge request gitlab-org/gitlab-ee!6870
```
  46e53a17
- Documentation for JUnit XML Test Summary In MR widget · 88ec099a
  Achilleas Pipinellis authored Aug 15, 2018
  
  88ec099a
- Fix rubocop complain around package_name_regex · 1efbbeb2
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1efbbeb2
- Refactor migrations in a way it can work with MySQL properly · f7194365
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f7194365
- Fix spec not_to syntax for package models · 9b912362
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9b912362
- Merge branch '6142-geo-sync-disabled-wikis' into 'master' · 7374d385
  Nick Thomas authored Aug 15, 2018
```
Resolve "Geo: sync disabled wikis"

Closes #7161 and #6142

See merge request gitlab-org/gitlab-ee!6420
```
  7374d385
- Resolve "Geo: sync disabled wikis" · 49988c12
  Valery Sizov authored Aug 15, 2018
  
  49988c12
- Merge branch '6541-custom-favicons-not-being-replicated-by-geo' into 'master' · 7f8db8de
  Nick Thomas authored Aug 15, 2018
```
Resolve "Custom favicons not being replicated by Geo"

Closes #6541

See merge request gitlab-org/gitlab-ee!6860
```
  7f8db8de
- Reduce path to 512 chars to make id+path index to work with mysql · af4a4ef0
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  af4a4ef0
- Updated URL in JS Snowplow template + added changelog · b2f0a33f
  Tim Zallmann authored Aug 15, 2018
  
  b2f0a33f
- Set sp.js to be precompiled so its available in production · d202fc96
  Tim Zallmann authored Aug 15, 2018
  
  d202fc96
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-15 · 12b20883
  GitLab Bot authored Aug 15, 2018
```
# Conflicts:
#	app/assets/stylesheets/framework/common.scss

[ci skip]
```
  12b20883
14 Aug, 2018 19 commits
- Merge branch '50180-fa-icon-google-audit' into 'master' · 89e53e4a
  Stan Hu authored Aug 14, 2018
```
Resolve "Profile audit log does not show Google icon properly"

Closes #50180

See merge request gitlab-org/gitlab-ce!21207
```
  89e53e4a
- Fix rubocop offense · c0d1d461
  Jan Beckmann authored Aug 14, 2018
  
  c0d1d461
- Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master' · 6343964b
  Kamil Trzciński authored Aug 14, 2018
```
Expose all artifacts sizes in jobs api

See merge request gitlab-org/gitlab-ce!20821
```
  6343964b
- Add merge request number to changelog · 50a23178
  Jan Beckmann authored Aug 14, 2018
  
  50a23178
- Fix missing Google icon in audit log · b4e682ee
  Jan Beckmann authored Aug 14, 2018
```
Fixes #50180
```
  b4e682ee
- Merge branch 'ce-to-ee-2018-08-14' into 'master' · 11c73086
  Robert Speicher authored Aug 14, 2018
```
CE upstream - 2018-08-14 16:07 UTC

Closes gitaly#1233, gitaly#1286, and gitlab-org/quality/nightly#3

See merge request gitlab-org/gitlab-ee!6892
```
  11c73086
- Add format validation to package models · 62874176
  Dmitriy Zaporozhets authored Aug 14, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  62874176
- Fix maven packages path type in db/schema.rb · ae7687f8
  Dmitriy Zaporozhets authored Aug 14, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ae7687f8
- Update docs to change `Backlog` issue board list to `Open` · 6fd743da
  Kushal Pandya authored Aug 14, 2018
  
  6fd743da
- Resolve locale/gitlab.pot · d5bbc475
  Robert Speicher authored Aug 14, 2018
  
  d5bbc475
- Merge branch 'scss-variables-2' into 'master' · 125809ce
  Clement Ho authored Aug 14, 2018
```
Remove scss variables, part 2

See merge request gitlab-org/gitlab-ce!21169
```
  125809ce
- Remove scss variables, part 2 · 65827c42
  Annabel Gray authored Aug 14, 2018
  
  65827c42
- Merge branch 'ee-scss-variables-2' into 'master' · b3481d3d
  Clement Ho authored Aug 14, 2018
```
EE- Remove scss variables, part 2

See merge request gitlab-org/gitlab-ee!6887
```
  b3481d3d
- EE- Remove scss variables, part 2 · e925d6e6
  Annabel Gray authored Aug 14, 2018
  
  e925d6e6
- Resolve app/services/notification_recipient_service.rb · 4f0a69a0
  Robert Speicher authored Aug 14, 2018
  
  4f0a69a0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-14 · 68f4b26e
  GitLab Bot authored Aug 14, 2018
```
# Conflicts:
#	app/services/notification_recipient_service.rb
#	doc/user/project/issue_board.md
#	locale/gitlab.pot

[ci skip]
```
  68f4b26e
- Merge branch 'ce-to-ee-2018-08-13' into 'master' · 3ff95c3c
  Robert Speicher authored Aug 14, 2018
```
CE upstream - 2018-08-13 21:22 UTC

Closes gitlab-ce#50210

See merge request gitlab-org/gitlab-ee!6888
```
  3ff95c3c
- Rename admin_package policy to create_package · b71743c4
  Dmitriy Zaporozhets authored Aug 14, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b71743c4
- Improve migrations for maven packages feature · 3604fd38
  Dmitriy Zaporozhets authored Aug 14, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3604fd38