Commits · 681b0db6c3ff31f7ee7a325c55677b9f845ab04c · nexedi / gitlab-ce

17 Aug, 2018 2 commits
- Merge branch 'master' into 'ce-to-ee-2018-08-15' · 681b0db6
  Achilleas Pipinellis authored Aug 17, 2018
```
# Conflicts:
#   doc/api/settings.md
```
  681b0db6
- Resolve docs conflicts · e407e1c5
  Achilleas Pipinellis authored Aug 17, 2018
  
  e407e1c5
16 Aug, 2018 11 commits
- Merge branch 'docs/custom-templates-link' into 'master' · 2d25b865
  Mike Lewis authored Aug 16, 2018
```
Fix link under custom project template docs

See merge request gitlab-org/gitlab-ee!6917
```
  2d25b865
- Fix link under custom project template docs · 3f18ffb6
  Achilleas Pipinellis authored Aug 16, 2018
  
  3f18ffb6
- Merge branch 'improve-project-manifest-import-docs' into 'master' · 0ff46591
  Achilleas Pipinellis authored Aug 16, 2018
```
Improve Project import via manifest docs

See merge request gitlab-org/gitlab-ee!6839
```
  0ff46591
- Improve Project import via manifest docs · 6dcaaca5
  Andreas Kämmerle authored Aug 16, 2018
  
  6dcaaca5
- Merge branch '49796-project-deletion-may-not-log-audit-events-during-group-deletion' into 'master' · 13e931e4
  Nick Thomas authored Aug 16, 2018
```
Port of CE MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21162

See merge request gitlab-org/gitlab-ee!6911
```
  13e931e4
- Merge branch 'instance-statistics-docs-ee' into 'master' · 95b2adc7
  Marcia Ramos authored Aug 16, 2018
```
Instance statistics docs ee

See merge request gitlab-org/gitlab-ee!6903
```
  95b2adc7
- Instance statistics docs ee · 96bdbda6
  Achilleas Pipinellis authored Aug 16, 2018
  
  96bdbda6
- Fix: Project deletion may not log audit events during group deletion · 47a60a0c
  Valery Sizov authored Aug 13, 2018
  
  47a60a0c
- Merge branch 'docs-processes-ee' into 'master' · 124aacd8
  Achilleas Pipinellis authored Aug 16, 2018
```
Documentation process at GitLab

See merge request gitlab-org/gitlab-ee!6913
```
  124aacd8
- Merge branch 'docs-processes' into 'master' · 51225328
  Marcia Ramos authored Aug 16, 2018
```
Documentation process at GitLab

Closes #46843

See merge request gitlab-org/gitlab-ce!19902
```
  51225328
- Resolve conflicts for locale/gitlab.pot · 7a1a494a
  Filipa Lacerda authored Aug 16, 2018
  
  7a1a494a
15 Aug, 2018 27 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
- Fix conflict in db/schema.rb · 49b45fca
  Dmitriy Zaporozhets authored Aug 15, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  49b45fca
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-15 · 6929e1c3
  GitLab Bot authored Aug 15, 2018
```
# Conflicts:
#	db/schema.rb
#	doc/README.md
#	doc/ci/examples/README.md
#	doc/user/project/merge_requests/index.md
#	locale/gitlab.pot

[ci skip]
```
  6929e1c3
- 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
- Merge branch 'backport-author-link-style' into 'master' · 353360ef
  Phil Hughes authored Aug 15, 2018
```
Add author-link style from common.scss in EE

See merge request gitlab-org/gitlab-ce!21204
```
  353360ef
- Merge branch 'ab-49788-reduce-model-instances-in-test' into 'master' · 6010fe86
  Sean McGivern authored Aug 15, 2018
```
Reduce number of model instances needed in test.

Closes #49788

See merge request gitlab-org/gitlab-ce!21192
```
  6010fe86
- Merge branch 'bvl-add-czech' into 'master' · c0d42d2e
  Sean McGivern authored Aug 15, 2018
```
Add Czech as an available language

Closes #43227

See merge request gitlab-org/gitlab-ce!21201
```
  c0d42d2e
- 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' into 'master' · 7ff0dbc5
  Marcia Ramos authored Aug 15, 2018
```
Documentation for JUnit XML Test Summary In MR widget

Closes #49867

See merge request gitlab-org/gitlab-ce!21061
```
  7ff0dbc5
- Documentation for JUnit XML Test Summary In MR widget · 6e9e61dc
  Shinya Maeda authored Aug 15, 2018
  
  6e9e61dc
- 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
- Merge branch 'port-i18n-for-mirrors-instructions' into 'master' · 218fc3e3
  Douwe Maan authored Aug 15, 2018
```
Port EE changes for mirrors/_instructions.html.haml

See merge request gitlab-org/gitlab-ce!21107
```
  218fc3e3
- 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
- Merge branch 'add-user_show_add_ssh_key_message-application-setting' into 'master' · 9b718a76
  Nick Thomas authored Aug 15, 2018
```
Add a "user_show_add_ssh_key_message" application setting for use with SSH certificates

Closes #49953

See merge request gitlab-org/gitlab-ce!21027
```
  9b718a76
- 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
- Add Czech as an available language · ce6a50b6
  Bob Van Landuyt authored Aug 14, 2018
```
New translations added to `locale/cs_CZ` will automatically be picked up.
```
  ce6a50b6
- Reduce number of model instances needed in test. · 0d7ea0b3
  Andreas Brandl authored Aug 14, 2018
```
Closes #49788.
```
  0d7ea0b3