Commits · d988966c96a69d9ad0116f9dac80614c13791ec8 · nexedi / gitlab-ce

30 Jan, 2018 36 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-30 · d988966c
  GitLab Bot authored Jan 30, 2018
  
  d988966c
- Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master' · 7f647f9f
  Sean McGivern authored Jan 30, 2018
```
Check MR state before submitting queries for discussion state

Closes #42236

See merge request gitlab-org/gitlab-ce!16788
```
  7f647f9f
- Merge branch 'rc/port-ee-4064' into 'master' · 03f386c2
  Rémy Coutable authored Jan 30, 2018
```
Port changes from gitlab-org/gitlab-ee!4064 to CE

See merge request gitlab-org/gitlab-ce!16796
```
  03f386c2
- Merge branch 'mk-add-test-for-attachment-replication' into 'master' · f9a09067
  Rémy Coutable authored Jan 30, 2018
```
Add Geo attachment replication QA spec

Closes gitlab-qa#128

See merge request gitlab-org/gitlab-ee!4064
```
  f9a09067
- Merge branch '42569-lint-changelog-yaml-script-is-run-twice-in-ci' into 'master' · c7f70155
  Grzegorz Bizon authored Jan 30, 2018
```
Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job

Closes #42569

See merge request gitlab-org/gitlab-ce!16790
```
  c7f70155
- Merge branch 'ph-ajax-into-axios' into 'master' · 8957947e
  Filipa Lacerda authored Jan 30, 2018
```
More $.ajax conversions to axios

See merge request gitlab-org/gitlab-ce!16761
```
  8957947e
- Merge branch 'ee-update-create-item-dropdown-with-create-new-item-option' into 'master' · 66613f34
  Filipa Lacerda authored Jan 30, 2018
```
Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown` -- EE merge edition

See merge request gitlab-org/gitlab-ee!4307
```
  66613f34
- Merge branch 'update-create-item-dropdown-with-create-new-item-option' into 'master' · 8e7c7f92
  Filipa Lacerda authored Jan 30, 2018
```
Add `createNewItemFromValue` option and `clearDropdown` method to `create_item_dropdown`

See merge request gitlab-org/gitlab-ce!16699
```
  8e7c7f92
- Port changes from gitlab-org/gitlab-ee!4064 to CE · 38f30008
  Rémy Coutable authored Jan 30, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  38f30008
- Merge branch 'ce-to-ee-2018-01-30' into 'master' · 151ca197
  Marin Jankovski authored Jan 30, 2018
```
CE upstream - 2018-01-30 11:56 UTC

See merge request gitlab-org/gitlab-ee!4315
```
  151ca197
- Merge branch 'axios-get-single-file-diff' into 'master' · e74e6fcb
  Filipa Lacerda authored Jan 30, 2018
```
Replace $.get in single file diff with axios

See merge request gitlab-org/gitlab-ce!16696
```
  e74e6fcb
- Replace $.get in single file diff with axios · dfc62605
  Clement Ho authored Jan 30, 2018
  
  dfc62605
- Add Geo attachment replication QA spec · 468072d0
  Michael Kozono authored Jan 26, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  468072d0
- Merge branch 'axios-post-label-manager' into 'master' · 5f1a09e2
  Fatih Acet authored Jan 30, 2018
```
Replace $.post in label manager with axios

See merge request gitlab-org/gitlab-ce!16695
```
  5f1a09e2
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-30 · 99be74fe
  GitLab Bot authored Jan 30, 2018
  
  99be74fe
- Merge branch 'patch-28' into 'master' · a03ea193
  Rémy Coutable authored Jan 30, 2018
```
doc: Correct example responses in repository_files.md

See merge request gitlab-org/gitlab-ce!16754
```
  a03ea193
- Merge branch 'patch-28' into 'master' · 2d481094
  Rémy Coutable authored Jan 30, 2018
```
Update index.md

See merge request gitlab-org/gitlab-ce!16733
```
  2d481094
- cache jQuery selector · dc996051
  Phil Hughes authored Jan 30, 2018
  
  dc996051
- Add createNewItemFromValue option and clearDropdown method · 7b9a0092
  Eric Eastwood authored Jan 25, 2018
```
Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
```
  7b9a0092
- Add createNewItemFromValue option and clearDropdown method · 5a22b588
  Eric Eastwood authored Jan 25, 2018
```
Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
```
  5a22b588
- Don't run scripts/lint-changelog-yaml in scripts/static-analysis but only in the 'docs lint' job · 33ed9622
  Rémy Coutable authored Jan 30, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  33ed9622
- Merge branch 'grape-router-helpers-bugfix' into 'master' · 51c8d5b2
  Rémy Coutable authored Jan 30, 2018
```
Fix grape-route-helper route shadowing

See merge request gitlab-org/gitlab-ce!16781
```
  51c8d5b2
- Merge branch '41802-add-space-to-edit-delete-tag-btns' into 'master' · 47ed0a99
  Filipa Lacerda authored Jan 30, 2018
```
Resolve "Missing space between edit and delete buttons in tag list"

Closes #41802

See merge request gitlab-org/gitlab-ce!16757
```
  47ed0a99
- Update CHANGELOG.md for 10.4.2 · dfe9d495
  Mark Fletcher authored Jan 30, 2018
```
[ci skip]
```
  dfe9d495
- Merge branch 'ce-to-ee-2018-01-30' into 'master' · f02217c0
  Marin Jankovski authored Jan 30, 2018
```
CE upstream - 2018-01-30 09:26 UTC

See merge request gitlab-org/gitlab-ee!4313
```
  f02217c0
- Update CHANGELOG.md for 10.4.2 · 015d8a75
  Mark Fletcher authored Jan 30, 2018
```
[ci skip]
```
  015d8a75
- Update CHANGELOG-EE.md for 10.4.2-ee · a818543f
  Mark Fletcher authored Jan 30, 2018
```
[ci skip]
```
  a818543f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-30 · feb76f63
  GitLab Bot authored Jan 30, 2018
  
  feb76f63
- Merge branch 'fix-prometheus-empty-state-no-data' into 'master' · 364395b3
  Phil Hughes authored Jan 30, 2018
```
Add noData empty state to Prometheus graphs

Closes #42558

See merge request gitlab-org/gitlab-ce!16777
```
  364395b3
- Merge branch 'ce-to-ee-2018-01-30' into 'master' · c61a917f
  Lin Jen-Shin authored Jan 30, 2018
```
CE upstream - 2018-01-30 06:24 UTC

See merge request gitlab-org/gitlab-ee!4312
```
  c61a917f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-30 · ab931ae4
  GitLab Bot authored Jan 30, 2018
  
  ab931ae4
- Check MR state before submitting queries for discussion state · dbfedb5a
  Oswaldo Ferreira authored Jan 29, 2018
  
  dbfedb5a
- Merge branch 'dm-remote-mirror-url-availability' into 'master' · ef33f884
  Robert Speicher authored Jan 30, 2018
```
Allow project to be set up to push to and pull from same mirror

Closes #4670

See merge request gitlab-org/gitlab-ee!4310
```
  ef33f884
- Merge branch 'sh-fix-jira-trailing-slash' into 'master' · 2d6a017d
  Robert Speicher authored Jan 30, 2018
```
Fix JIRA not working when a trailing slash is included

Closes #42494

See merge request gitlab-org/gitlab-ce!16748
```
  2d6a017d
- Fix JIRA not working when a trailing slash is included · 8f965d0f
  Stan Hu authored Jan 26, 2018
```
Leaving a trailing slash in the context option causes the jira-ruby
gem to add an extra slash in HTTP requests to the URL, preventing
JIRA from working properly.

Closes #42494
```
  8f965d0f
- Merge branch 'ce-to-ee-2018-01-29' into 'master' · 3bcd842d
  Stan Hu authored Jan 30, 2018
```
CE upstream - 2018-01-29 21:25 UTC

See merge request gitlab-org/gitlab-ee!4309
```
  3bcd842d
29 Jan, 2018 4 commits
- Allow project to be set up to push to and pull from same mirror · 3c9b4da8
  Douwe Maan authored Jan 29, 2018
  
  3c9b4da8
- Fix grape-route-helper route shadowing · 233a9861
  Mario de la Ossa authored Jan 29, 2018
```
Bringing in https://github.com/reprah/grape-route-helpers/pull/21 as a
monkey patch since the grape-route-helpers project seems to be abandoned
```
  233a9861
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-29 · ac82a645
  GitLab Bot authored Jan 29, 2018
  
  ac82a645
- Merge branch '41972-make-sure-no-warnings' into 'master' · 1f309b69
  Robert Speicher authored Jan 29, 2018
```
Fail static-analysis if there's output to stderr

Closes #41972

See merge request gitlab-org/gitlab-ce!16648
```
  1f309b69