Commits · 3049c3bb8ac3ba568f1b44ae26412ae58065f046 · nexedi / gitlab-ce

19 Feb, 2018 15 commits
- Merge branch 'bvl-only-check-file-location-in-test-stage' into 'master' · 3049c3bb
  Rémy Coutable authored Feb 19, 2018
```
Move ee-files-location-check to the test stage

See merge request gitlab-org/gitlab-ee!4580
```
  3049c3bb
- Merge branch 'jramsay-1989-rename-geo-docs' into 'master' · 24cf02b6
  Achilleas Pipinellis authored Feb 19, 2018
```
Separate Disaster Recovery docs from Geo docs

Closes #1989

See merge request gitlab-org/gitlab-ee!4511
```
  24cf02b6
- Refactor DR docs · fa82064f
  Achilleas Pipinellis authored Feb 19, 2018
  
  fa82064f
- Remove unneeded images from old Geo docs · 70ed52c8
  Achilleas Pipinellis authored Feb 19, 2018
  
  70ed52c8
- Point to final doc location · 3e909ff2
  Achilleas Pipinellis authored Feb 19, 2018
  
  3e909ff2
- Merge branch 'ee-jej/avoid-slow-file-lock-checks' into 'master' · 45f92fc1
  Sean McGivern authored Feb 19, 2018
```
[EE MR] Avoid slow File Lock checks when not used

See merge request gitlab-org/gitlab-ee!4548
```
  45f92fc1
- Merge branch 'docs-articles-layout-frontmatter-ee' into 'master' · eae1bfc0
  Achilleas Pipinellis authored Feb 19, 2018
```
Docs: Update all articles with the new layout (metadata from the frontmatter)

See merge request gitlab-org/gitlab-ee!4581
```
  eae1bfc0
- Docs: Update all articles with the new layout (metadata from the frontmatter) · e59876da
  Marcia Ramos authored Feb 19, 2018
  
  e59876da
- Merge branch 'ce-to-ee-2018-02-19' into 'master' · ece3acfb
  Marin Jankovski authored Feb 19, 2018
```
CE upstream - 2018-02-19 09:24 UTC

Closes #4825

See merge request gitlab-org/gitlab-ee!4592
```
  ece3acfb
- Avoid slow File Lock checks when not used · f270ad47
  James Edwards-Jones authored Feb 15, 2018
```
Also avoid double commit lookup during file lock check by reusing
memoized commits.
```
  f270ad47
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-19 · d777dc3a
  GitLab Bot authored Feb 19, 2018
  
  d777dc3a
- Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master' · 586816ae
  Douwe Maan authored Feb 19, 2018
```
Fix Error 500 when viewing a commit with a GPG signature in Geo

Closes gitlab-ee#4825

See merge request gitlab-org/gitlab-ce!17207
```
  586816ae
- Merge branch '41949-move' into 'master' · 637ab60c
  Douwe Maan authored Feb 19, 2018
```
Remember assignee when moving an issue

See merge request gitlab-org/gitlab-ce!17116
```
  637ab60c
- Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master' · 804b38d5
  Douwe Maan authored Feb 19, 2018
```
Sanitize extra blank spaces used when uploading a SSH key

Closes #40552

See merge request gitlab-org/gitlab-ce!17138
```
  804b38d5
- Fix Error 500 when viewing a commit with a GPG signature in Geo · fdad5768
  Stan Hu authored Feb 19, 2018
```
Closes gitlab-org/gitlab-ee#4825
```
  fdad5768
18 Feb, 2018 4 commits
- Remember assignee when moving an issue · 790ab590
  Jan Provaznik authored Feb 14, 2018
```
Related to #41949
```
  790ab590
- Merge branch 'ce-to-ee-2018-02-18' into 'master' · e8a37e6a
  Stan Hu authored Feb 18, 2018
```
CE upstream - 2018-02-18 06:29 UTC

See merge request gitlab-org/gitlab-ee!4587
```
  e8a37e6a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-18 · ca701a08
  GitLab Bot authored Feb 18, 2018
  
  ca701a08
- Merge branch '17500-mr-multiple-issues-oxford-comma' into 'master' · 557db7e6
  Stan Hu authored Feb 18, 2018
```
Update issue closing pattern to be more forgiving

Closes #17500

See merge request gitlab-org/gitlab-ce!17198
```
  557db7e6
17 Feb, 2018 13 commits
- Merge branch 'ce-to-ee-2018-02-17' into 'master' · ce97cfa4
  Stan Hu authored Feb 17, 2018
```
CE upstream - 2018-02-17 16:53 UTC

See merge request gitlab-org/gitlab-ee!4586
```
  ce97cfa4
- Add changelog entry · 3a9a8031
  Vicky Chijwani authored Feb 17, 2018
  
  3a9a8031
- Allow oxford commas and spaces before commas in MR issue closing pattern. · 50cdf41e
  Vicky Chijwani authored Feb 17, 2018
  
  50cdf41e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-17 · 096eee7b
  GitLab Bot authored Feb 17, 2018
  
  096eee7b
- Merge branch 'revert-215dff76' into 'master' · cd82683e
  Ian Baum authored Feb 17, 2018
```
Revert "Merge branch 'expired-ci-artifacts' into 'master'"

See merge request gitlab-org/gitlab-ce!17193
```
  cd82683e
- Merge branch 'ce-to-ee-2018-02-17' into 'master' · 24676ad6
  Stan Hu authored Feb 17, 2018
```
CE upstream - 2018-02-17 09:44 UTC

See merge request gitlab-org/gitlab-ee!4584
```
  24676ad6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-17 · 29eae29c
  GitLab Bot authored Feb 17, 2018
  
  29eae29c
- Merge branch 'ce-to-ee-2018-02-17' into 'master' · 1488e815
  Stan Hu authored Feb 17, 2018
```
CE upstream - 2018-02-17 06:13 UTC

See merge request gitlab-org/gitlab-ee!4583
```
  1488e815
- Merge branch 'dm-dont-cache-nil-root-ref' into 'master' · 35ee6307
  Stan Hu authored Feb 17, 2018
```
Don't cache a nil repository root ref to prevent caching issues

See merge request gitlab-org/gitlab-ce!17179
```
  35ee6307
- Don't cache a nil repository root ref to prevent caching issues · 8b727fea
  Douwe Maan authored Feb 16, 2018
  
  8b727fea
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-17 · f988912e
  GitLab Bot authored Feb 17, 2018
  
  f988912e
- Merge branch 'ce-to-ee-2018-02-16' into 'master' · 8a6da07f
  Stan Hu authored Feb 17, 2018
```
CE upstream - 2018-02-16 15:23 UTC

Closes gitlab-ce#42939

See merge request gitlab-org/gitlab-ee!4579
```
  8a6da07f
- Merge branch '43345-spec-requests-api-project_import_spec-rb-fails' into 'master' · b6bea6c4
  Sean McGivern authored Feb 16, 2018
```
Resolve "spec/requests/api/project_import_spec.rb fails"

Closes #43345

See merge request gitlab-org/gitlab-ce!17184
```
  b6bea6c4
16 Feb, 2018 8 commits
- Merge branch '43296-fix-specs-broken-by-hardcoding-paths' into 'master' · 6fdfc20d
  Robert Speicher authored Feb 16, 2018
```
Fix order dependencies in some specs

Closes #43296

See merge request gitlab-org/gitlab-ce!17189
```
  6fdfc20d
- Add back database changes for Ci::Build · 1a6dbaef
  Stan Hu authored Feb 16, 2018
  
  1a6dbaef
- Revert "Merge branch 'expired-ci-artifacts' into 'master'" · a978a5e0
  Stan Hu authored Feb 16, 2018
```
This reverts merge request !16578
```
  a978a5e0
- Fix order dependencies in some specs · 17d842db
  Nick Thomas authored Feb 16, 2018
```
Our automatically-generated project paths are of the form project<N>. If a spec
manually specifies a project path of that form, it may conflict with the
automatically-generated paths in some circumstances.
```
  17d842db
- Merge branch 'fix-more-dispatcher-stuff' into 'master' · b2363483
  Jacob Schatz authored Feb 16, 2018
```
Remove more route-based chunks from dispatcher.js

See merge request gitlab-org/gitlab-ce!16901
```
  b2363483
- Merge branch '42641-monaco-service-workers-do-not-work-with-cdn-enabled' into 'master' · 8462e229
  Tim Zallmann authored Feb 16, 2018
```
Resolve "Monaco service workers do not work with CDN enabled"

Closes #42641

See merge request gitlab-org/gitlab-ce!17021
```
  8462e229
- Merge branch 'fl-refresh-btn' into 'master' · 306e0d16
  Tim Zallmann authored Feb 16, 2018
```
Show loading button inline in MR widget

See merge request gitlab-org/gitlab-ce!17174
```
  306e0d16
- migrate admin:users:* to static bundle · b63674e2
  Mike Greiling authored Feb 16, 2018
  
  b63674e2