Commits · efc4c0d95ed090916e897301933f86cf6db2db7f · nexedi / gitlab-ce

08 Sep, 2018 17 commits
- Merge branch 'ee-2934-create-new-project-re-add-project-name-field' into 'master' · efc4c0d9
  Tim Zallmann authored Sep 08, 2018
```
(Port from CE) Resolve "Create new project: Re-add project name field"

See merge request gitlab-org/gitlab-ee!7279
```
  efc4c0d9
- (Port from CE) Resolve "Create new project: Re-add project name field" · 074ba5d7
  Martin Wortschack authored Sep 08, 2018
  
  074ba5d7
- Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy-primary' into 'master' · 4aa72eac
  Stan Hu authored Sep 08, 2018
```
Geo: backend support to allow Secondary node to push to a Primary as push proxying

See merge request gitlab-org/gitlab-ee!6455
```
  4aa72eac
- Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master' · 482577c6
  Stan Hu authored Sep 08, 2018
```
SSH git push to secondary -> proxy to Primary

See merge request gitlab-org/gitlab-ee!6456
```
  482577c6
- Add comments containing the error msg for clarity · 90f0145e
  Ash McKenzie authored Sep 08, 2018
  
  90f0145e
- fixup! Allow upload_code ability for auth'd Geo request · eb970f8f
  Ash McKenzie authored Sep 08, 2018
  
  eb970f8f
- Fix push-to-primary API specs with base64 encoding changes · a9b10abc
  Stan Hu authored Sep 07, 2018
  
  a9b10abc
- Bump gitlab-shell to 8.3.0 · 96e157fe
  Stan Hu authored Sep 07, 2018
```
CE counterpart: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21607
```
  96e157fe
- Geo: SSH git push to secondary -> proxy to Primary · 3a32b221
  Ash McKenzie authored Aug 20, 2018
  
  3a32b221
- Update push to secondary docs · 31ac4e49
  Ash McKenzie authored Aug 20, 2018
  
  31ac4e49
- Allow GeoGitAccess to perform custom action · ee5602f0
  Ash McKenzie authored Aug 20, 2018
  
  ee5602f0
- New geo/proxy_git_push_ssh routes · d67a2497
  Ash McKenzie authored Aug 20, 2018
  
  d67a2497
- New Gitlab::Geo::GitPushSSHProxy · 9decb78c
  Ash McKenzie authored Aug 20, 2018
  
  9decb78c
- Changelog Allow push_code when auth'd via Geo JWT · c48ad0fb
  Ash McKenzie authored Aug 08, 2018
  
  c48ad0fb
- Allow upload_code ability for auth'd Geo request · 1a675dc9
  Ash McKenzie authored Aug 06, 2018
  
  1a675dc9
- New Geo::PushUser · 3bcb345e
  Ash McKenzie authored Aug 09, 2018
  
  3bcb345e
- Move Geo pull/push checks into EE GitAccess spec · 9e0dffa3
  Ash McKenzie authored Aug 06, 2018
  
  9e0dffa3
07 Sep, 2018 23 commits
- Merge branch 'ee-specify-variables-manual-pipeline' into 'master' · 58d7871a
  Achilleas Pipinellis authored Sep 07, 2018
```
(Port from CE) Document how to specify environment variables during manual…

See merge request gitlab-org/gitlab-ee!7260
```
  58d7871a
- (Port from CE) Document how to specify environment variables during manual… · 9045e6d0
  Evan Read authored Sep 07, 2018
  
  9045e6d0
- Merge branch 'update-svg' into 'master' · 951e5c30
  Mike Greiling authored Sep 07, 2018
```
update gitlab-svg version to match ce

See merge request gitlab-org/gitlab-ee!7288
```
  951e5c30
- Merge branch 'ee-50695-ce-documentation-is-not-commonmark-compliant-docs' into 'master' · a9750267
  Stan Hu authored Sep 07, 2018
```
Update documentation for compliance with CommonMark

See merge request gitlab-org/gitlab-ee!7184
```
  a9750267
- Update documentation for compliance with CommonMark · 8fd881f7
  Brett Walker authored Sep 07, 2018
  
  8fd881f7
- update gitlab-svg version to match ce · 22a9c5f0
  Clement Ho authored Sep 07, 2018
  
  22a9c5f0
- Merge branch 'rd-26044-new-option-to-prevent-too-big-git-pushes-ee' into 'master' · ed3becb2
  Robert Speicher authored Sep 07, 2018
```
Solve conflicts from gitlab-ce/merge_requests!20758

See merge request gitlab-org/gitlab-ee!6812
```
  ed3becb2
- Merge branch 'fix-label-ref-ee' into 'master' · becca05c
  Robert Speicher authored Sep 07, 2018
```
[EE] Sort labels by reference

See merge request gitlab-org/gitlab-ee!7284
```
  becca05c
- Add receive_max_input_size setting to Application settings · 1e760f35
  Rubén Dávila authored Sep 07, 2018
```
If user has configure the setting then it will be passed to gitlab-shell
and gitlab-workhorse
```
  1e760f35
- Merge branch 'ee-7204-follow-up-protected-environments-technical-debt-ce' into 'master' · 0bb43e71
  Kamil Trzciński authored Sep 07, 2018
```
Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545

See merge request gitlab-org/gitlab-ee!7283
```
  0bb43e71
- Merge branch 'usage_consent-ee' into 'master' · 01d3f21e
  Douwe Maan authored Sep 07, 2018
```
[EE] Ask user explicitly about usage stats agreement

See merge request gitlab-org/gitlab-ee!7072
```
  01d3f21e
- [EE] Ask user explicitly about usage stats agreement · 8b1cf745
  Jan Provaznik authored Sep 07, 2018
  
  8b1cf745
- Sort labels by reference · ff05168d
  Jan Provaznik authored Sep 07, 2018
```
Labels are sorted by reference, not title. This caused random CI
failure.
```
  ff05168d
- Introduce class methods so CE constants can be easily overridden on EE · 8d565c1b
  Mayra Cabrera authored Sep 05, 2018
  
  8d565c1b
- Merge branch '48778-remove-old-storage-logic-from-import-export-ee' into 'master' · 2d82ed8a
  Douwe Maan authored Sep 07, 2018
```
[EE] Resolve "Remove old storage logic from Import/Export"

See merge request gitlab-org/gitlab-ee!7270
```
  2d82ed8a
- Merge branch 'ce-to-ee-2018-09-07' into 'master' · 9cca757e
  Marin Jankovski authored Sep 07, 2018
```
CE upstream - 2018-09-07 00:21 UTC

See merge request gitlab-org/gitlab-ee!7275
```
  9cca757e
- Removes extra banner from flash messages · 12384bb9
  Mayra Cabrera authored Sep 07, 2018
  
  12384bb9
- fix specs · 051707e0
  James Lopez authored Sep 07, 2018
  
  051707e0
- Fixes conflicts on config/sidekiq_queues.yml · ca4d9620
  Mayra Cabrera authored Sep 07, 2018
  
  ca4d9620
- Fixes conflicts on app/views/projects/_flash_messages.html.haml · f7776b1d
  Mayra Cabrera authored Sep 07, 2018
  
  f7776b1d
- Merge branch 'label-event-ee' into 'master' · 78865a28
  Jan Provaznik authored Sep 07, 2018
```
[EE] Use ResourceLabelEvent for tracking label changes

See merge request gitlab-org/gitlab-ee!6912
```
  78865a28
- [EE] Use ResourceLabelEvent for tracking label changes · 5c42ad75
  Jan Provaznik authored Sep 07, 2018
  
  5c42ad75
- upate EE code based on refactor · 7c37a8c5
  James Lopez authored Sep 07, 2018
  
  7c37a8c5