Commits · e950acfb7500aa93ccf5bbf45809e50655f88b8a · nexedi / gitlab-ce

05 Jul, 2018 11 commits
- Resolve "Support GitLab subgroups in Jira development panel" · e950acfb
  Mark Chao authored Jul 05, 2018
  
  e950acfb
- Merge branch 'ce-to-ee-2018-07-04' into 'master' · 05542079
  Rémy Coutable authored Jul 05, 2018
```
CE upstream - 2018-07-04 12:21 UTC

Closes gitaly#329, gitaly#320, gitaly#323 et gitaly#328

See merge request gitlab-org/gitlab-ee!6381
```
  05542079
- Allow 2 more queries in spec/controllers/projects/pipelines_controller_spec.rb · c32af9da
  Rémy Coutable authored Jul 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c32af9da
- Update CHANGELOG.md for 11.0.3 · 8078f779
  GitLab Release Tools Bot authored Jul 05, 2018
```
[ci skip]
```
  8078f779
- Update CHANGELOG-EE.md for 11.0.3-ee · 3ad14d4e
  GitLab Release Tools Bot authored Jul 05, 2018
```
[ci skip]
```
  3ad14d4e
- Merge branch '5787-extract-ee-boards' into 'master' · 4cabcba5
  Phil Hughes authored Jul 05, 2018
```
Extract EE specific files/lines for app/assets/javascripts/boards

See merge request gitlab-org/gitlab-ee!6006
```
  4cabcba5
- Extract EE specific files/lines for app/assets/javascripts/boards · 92f8df4a
  Paul Slaughter authored Jul 05, 2018
  
  92f8df4a
- Merge branch 'minor-profile-pref-update-doc' into 'master' · de46bf61
  Achilleas Pipinellis authored Jul 05, 2018
```
Minor layout width update in profile preferences docs

See merge request gitlab-org/gitlab-ee!6380
```
  de46bf61
- Replace .shared? with .instance_type? in ee/app/models/ee/ci/build.rb · 8d5382e8
  Rémy Coutable authored Jul 05, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8d5382e8
- Merge branch 'winh-rubocop-capybara-featuremethods-ee' into 'master' · e21f486a
  Rémy Coutable authored Jul 05, 2018
```
Enable Capybara/FeatureMethods cop (EE-port)

See merge request gitlab-org/gitlab-ee!6385
```
  e21f486a
- Enable Capybara/FeatureMethods cop (EE-port) · 57900720
  Winnie Hellmann authored Jul 05, 2018
  
  57900720
04 Jul, 2018 29 commits
- Merge branch '4266-board-with-config-api' into 'master' · 0cc2caaf
  Douwe Maan authored Jul 04, 2018
```
Resolve "Board with config API"

Closes #4266

See merge request gitlab-org/gitlab-ee!5954
```
  0cc2caaf
- Merge branch 'ee-43446-new-cluster-page-tabs' into 'master' · 873de89b
  Kamil Trzciński (OoO till 3th) authored Jul 04, 2018
```
port 43446-new-cluster-page-tabs to EE

See merge request gitlab-org/gitlab-ee!5944
```
  873de89b
- Merge branch 'revert-b5c890cc' into 'master' · 514b7c10
  Sean McGivern authored Jul 04, 2018
```
Revert "Merge branch 'ee-44726-cancel_lease_upon_completion_in_project_cache_worker' into 'master'"

See merge request gitlab-org/gitlab-ee!6378
```
  514b7c10
- fix failing CI jobs · ea79aab7
  Dennis Tang authored Jul 04, 2018
  
  ea79aab7
- Add API endpoint for viewing and editing board config · a5521d78
  Mark Chao authored Jun 04, 2018
```
Allow Labels::FindOrCreateService to find ancestor group labels
```
  a5521d78
- Remove duplicated api endpoint already existed in CE · c4bbfe3e
  Mark Chao authored Jun 07, 2018
  
  c4bbfe3e
- Fix Board#weight schema · 7f775872
  Mark Chao authored Jun 29, 2018
  
  7f775872
- Move EE specific spec under ee · f722227b
  Mark Chao authored Jun 06, 2018
  
  f722227b
- Authorize for single board reading · 9e80c203
  lulalala authored May 14, 2018
  
  9e80c203
- Fix other conflict in doc/administration/uploads.md · cdc2b7e6
  Stan Hu authored Jul 04, 2018
  
  cdc2b7e6
- Merge branch '5481-epic-todos' into 'master' · 79d64720
  Sean McGivern authored Jul 04, 2018
```
Todos for epics

Closes #5481

See merge request gitlab-org/gitlab-ee!6142
```
  79d64720
- Resolve conflict in doc/administration/uploads.md · 862821d8
  Stan Hu authored Jul 04, 2018
  
  862821d8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-04 · a4b5a5e6
  GitLab Bot authored Jul 04, 2018
```
# Conflicts:
#	doc/administration/uploads.md

[ci skip]
```
  a4b5a5e6
- Merge branch 'workhorse-5-0-0' into 'master' · ecf9c145
  Kamil Trzciński (OoO till 3th) authored Jul 04, 2018
```
Update Workhorse to v5.0.0

See merge request gitlab-org/gitlab-ce!20370
```
  ecf9c145
- Update doc/user/profile/preferences.md · 9c771a81
  Andreas Kämmerle authored Jul 04, 2018
  
  9c771a81
- Revert "Merge branch 'ee-44726-cancel_lease_upon_completion_in_project_cache_worker' into 'master'" · 30c13341
  Sean McGivern authored Jul 04, 2018
```
This reverts merge request !6315
```
  30c13341
- Change case when to guard clause · 79fd7367
  Jarka Kadlecová authored Jul 04, 2018
  
  79fd7367
- Update Workhorse to v5.0.0 · fff2f776
  Nick Thomas authored Jul 04, 2018
  
  fff2f776
- Merge branch 'ce-to-ee-2018-07-04' into 'master' · 41c3e005
  Marin Jankovski authored Jul 04, 2018
```
CE upstream - 2018-07-04 09:23 UTC

Closes gitaly#949, gitaly#911, gitaly#820, gitaly#514, gitaly#551, gitaly#321, and gitaly#565

See merge request gitlab-org/gitlab-ee!6375
```
  41c3e005
- Merge branch 'bvl-port-of-ee-translations' into 'master' · 935969be
  Douwe Maan authored Jul 04, 2018
```
Port of EE-translations

See merge request gitlab-org/gitlab-ce!20362
```
  935969be
- Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master' · 7a355f68
  Sean McGivern authored Jul 04, 2018
```
Remove more Gitaly feature flags

Closes gitaly#329, gitaly#320, gitaly#323, and gitaly#328

See merge request gitlab-org/gitlab-ce!20343
```
  7a355f68
- Merge branch 'remove-is-shared-from-ci-runners' into 'master' · 48bbb363
  Grzegorz Bizon authored Jul 04, 2018
```
Remove the use of `is_shared` of `Ci::Runner`

See merge request gitlab-org/gitlab-ce!20172
```
  48bbb363
- Merge branch 'ccr/flaky_mr_list_spec' into 'master' · d026441b
  Sean McGivern authored Jul 04, 2018
```
Fix flaky spec for merge request lists

See merge request gitlab-org/gitlab-ce!20316
```
  d026441b
- Merge branch 'jprovazn-fix-mr-caching' into 'master' · b2f2241c
  Sean McGivern authored Jul 04, 2018
```
Use serialize_keys as part of highlight diff cache key

Closes #48801

See merge request gitlab-org/gitlab-ce!20360
```
  b2f2241c
- Move group_dropdown_label to ce helper · caad256c
  Jarka Kadlecová authored Jul 04, 2018
  
  caad256c
- Merge branch 'jprovazn-direct-upload' into 'master' · 34694c3a
  Kamil Trzciński (OoO till 3th) authored Jul 04, 2018
```
Add workhorse authorize method for project/group uploads

Closes #44663

See merge request gitlab-org/gitlab-ce!19717
```
  34694c3a
- Merge branch 'ee-jprovazn-direct-upload' into 'master' · 75767c79
  Kamil Trzciński (OoO till 3th) authored Jul 04, 2018
```
[EE] Add workhorse authorize method for project/group uploads

See merge request gitlab-org/gitlab-ee!6167
```
  75767c79
- Merge branch 'ide-even-more-improved-errors' into 'master' · cda22d07
  Filipa Lacerda authored Jul 04, 2018
```
Improve error message across IDE store modules

Closes #47323

See merge request gitlab-org/gitlab-ce!20272
```
  cda22d07
- Merge branch 'master-i18n' into 'master' · 5dfdf25d
  Douwe Maan authored Jul 03, 2018
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!6299
```
  5dfdf25d