Commits · 44a24f1054f6021a05c549900d276de4a5434d29 · nexedi / gitlab-ce

07 Nov, 2018 2 commits
- Fix ee/app/services/projects/update_mirror_service.rb to account for changes in fetch_remote · 44a24f10
  Nick Thomas authored Nov 07, 2018
  
  44a24f10
- Geo: fetch_remote can now raise Gitlab::Git::BaseError · 0f7ab526
  Nick Thomas authored Nov 07, 2018
  
  0f7ab526
06 Nov, 2018 38 commits
- Fix packages conflict in gitlab.yml.example · 4ac37a0f
  James Edwards-Jones authored Nov 06, 2018
  
  4ac37a0f
- Resolve conflicts in MembersPreloader · 983cc308
  James Edwards-Jones authored Nov 06, 2018
  
  983cc308
- Fix conflicts · 3b1151a0
  Shinya Maeda authored Nov 07, 2018
  
  3b1151a0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-06 · f8c3b997
  GitLab Bot authored Nov 06, 2018
```
# Conflicts:
#	app/models/ci/build.rb
#	app/models/members_preloader.rb
#	config/gitlab.yml.example
#	db/schema.rb
#	spec/models/ci/build_spec.rb

[ci skip]
```
  f8c3b997
- Merge branch 'allow_single_letter_external_issue_ids' into 'master' · 3301876b
  Douglas Barbosa Alexandre authored Nov 06, 2018
```
Allow single letter external issue IDs

Closes #52803

See merge request gitlab-org/gitlab-ce!22717
```
  3301876b
- Merge branch 'unindirect-fetch-remote' into 'master' · ea3b8864
  Rémy Coutable authored Nov 06, 2018
```
Stop Repository#fetch_remote from using Gitlab::Shell

See merge request gitlab-org/gitlab-ce!22635
```
  ea3b8864
- Merge branch 'ce-jej/group-saml-sso-badges' into 'master' · 60f4a943
  Robert Speicher authored Nov 06, 2018
```
CE MR for Group SAML SSO badges

See merge request gitlab-org/gitlab-ce!22587
```
  60f4a943
- Merge branch 'jej/group-saml-sso-badges' into 'master' · 55913e7a
  Robert Speicher authored Nov 06, 2018
```
Group SAML status badges on members page

Closes #4515

See merge request gitlab-org/gitlab-ee!5807
```
  55913e7a
- Merge branch 'ccr/51052_keep_labels_on_issue' into 'master' · 992cff9c
  Robert Speicher authored Nov 06, 2018
```
Fixed label removal from issue

Closes #51052

See merge request gitlab-org/gitlab-ce!22762
```
  992cff9c
- Merge branch 'move-worker-prepends' into 'master' · 0bcfa77f
  Robert Speicher authored Nov 06, 2018
```
Move EE prepend/include to the end of workers

See merge request gitlab-org/gitlab-ee!8206
```
  0bcfa77f
- Merge branch 'move-presenter-prepends' into 'master' · 156dfa40
  Robert Speicher authored Nov 06, 2018
```
Move EE prepend/include to the end of presenters

See merge request gitlab-org/gitlab-ee!8205
```
  156dfa40
- Merge branch 'move-policy-prepends' into 'master' · c00d3357
  Robert Speicher authored Nov 06, 2018
```
Move EE prepend/include to the end of policies

See merge request gitlab-org/gitlab-ee!8204
```
  c00d3357
- Merge branch 'ce-to-ee-2018-11-06' into 'master' · 332cfd2f
  Steve Azzopardi authored Nov 06, 2018
```
CE upstream - 2018-11-06 12:21 UTC

Closes #8040

See merge request gitlab-org/gitlab-ee!8251
```
  332cfd2f
- Merge branch 'move-mailer-prepends' into 'master' · da8b1ac2
  Robert Speicher authored Nov 06, 2018
```
Move EE prepend/include to the end of mailers

See merge request gitlab-org/gitlab-ee!8202
```
  da8b1ac2
- Merge branch 'move-controller-prepends' into 'master' · be1be2c4
  Robert Speicher authored Nov 06, 2018
```
Move EE prepend/include to the end of controllers

See merge request gitlab-org/gitlab-ee!8201
```
  be1be2c4
- Merge branch 'move-service-prepends' into 'master' · 71cf8df0
  Robert Speicher authored Nov 06, 2018
```
Move EE prepend/include to the end of services

See merge request gitlab-org/gitlab-ee!8200
```
  71cf8df0
- Merge branch 'ml-fix-codeowners-spec-qa' into 'master' · 86201565
  Grzegorz Bizon authored Nov 06, 2018
```
Fix codeowners spec

Closes gitlab-org/quality/nightly#31

See merge request gitlab-org/gitlab-ee!8252
```
  86201565
- Merge branch '25140-disable-stop-button' into 'master' · d0c58a97
  Phil Hughes authored Nov 06, 2018
```
Disable stop environment button while deployment is running

See merge request gitlab-org/gitlab-ce!22805
```
  d0c58a97
- Disable stop environment button while deployment is running · 0cf721bd
  Filipa Lacerda authored Nov 06, 2018
  
  0cf721bd
- Merge branch 'rake-gitaly-check' into 'master' · e232ebf7
  Rémy Coutable authored Nov 06, 2018
```
Delegate storage health check to Gitaly's health check

Closes gitaly#1336

See merge request gitlab-org/gitlab-ce!22063
```
  e232ebf7
- Merge branch 'dz-add-packages-to-yml' into 'master' · d79828ec
  Marin Jankovski authored Nov 06, 2018
```
Add packages section to CE config file

See merge request gitlab-org/gitlab-ce!22151
```
  d79828ec
- Add specs for single-letter external tracker refs · 9de175bf
  Sean McGivern authored Nov 06, 2018
  
  9de175bf
- Merge branch '49403-redesign-activity-feed' into 'master' · 27ec84e3
  Annabel Dunstone Gray authored Nov 06, 2018
```
Resolve "Redesign activity feed"

Closes #49403

See merge request gitlab-org/gitlab-ce!22217
```
  27ec84e3
- Resolve "Redesign activity feed" · 31532b2d
  Martin Wortschack authored Nov 06, 2018
  
  31532b2d
- Merge branch 'gt-update-ops-dashboard-remove-dropdown-button' into 'master' · 848c7d8f
  Phil Hughes authored Nov 06, 2018
```
Update ops dashboard remove dropdown button

See merge request gitlab-org/gitlab-ee!8236
```
  848c7d8f
- Update ops dashboard remove dropdown button · 001969b7
  George Tsiolis authored Nov 06, 2018
  
  001969b7
- Merge branch '7750-epic-app-refactor' into 'master' · 5f68a904
  Phil Hughes authored Nov 06, 2018
```
Refactored Epic app shell

Closes #7750

See merge request gitlab-org/gitlab-ee!8059
```
  5f68a904
- Merge branch 'gt-clear-input-on-ops-project-search-on-submit' into 'master' · 96f84698
  Phil Hughes authored Nov 06, 2018
```
Clear ops dashboard project search input on submit

Closes #8262

See merge request gitlab-org/gitlab-ee!8239
```
  96f84698
- Merge branch 'support-project-security-dashboard' into 'master' · c628b6c7
  Grzegorz Bizon authored Nov 06, 2018
```
Support project security dashboard

See merge request gitlab-org/gitlab-ee!8222
```
  c628b6c7
- Merge branch 'restore-resource-user-via-browser-qa' into 'master' · c8b6b9f2
  Douglas Barbosa Alexandre authored Nov 06, 2018
```
Restore changes from:

See merge request gitlab-org/gitlab-ce!22838
```
  c8b6b9f2
- Merge branch 'support-project-security-dashboard' into 'master' · 6e9179ab
  Grzegorz Bizon authored Nov 06, 2018
```
Backport support project security dashboard changes

See merge request gitlab-org/gitlab-ce!22824
```
  6e9179ab
- Merge branch 'stateful_deployments-ee' into 'master' · ad19f51a
  Kamil Trzciński authored Nov 06, 2018
```
Port to EE: Add status to Deployment

See merge request gitlab-org/gitlab-ee!8057
```
  ad19f51a
- Merge branch 'support-license-management-and-performance-merge-request-widget-ee' into 'master' · fd50d49a
  Grzegorz Bizon authored Nov 06, 2018
```
Support license management and performance merge request widget

See merge request gitlab-org/gitlab-ee!8043
```
  fd50d49a
- Resolve conflict in app/assets/javascripts/reports/components/report_item.vue · 5b668b80
  Lukas Eipert authored Nov 06, 2018
  
  5b668b80
- Stop Repository#fetch_remote from using Gitlab::Shell · 668e5d63
  Nick Thomas authored Oct 26, 2018
```
This indirection doesn't provide any value, so remove it
```
  668e5d63
- Fix codeowners spec · d5dcbf7d
  Mark Lapierre authored Nov 06, 2018
```
Now that users are created via the API we don't need to sign out after
creating a user.
```
  d5dcbf7d
- Merge branch 'stateful_deployments' into 'master' · 1cf4aa02
  Kamil Trzciński authored Nov 06, 2018
```
Change life cycle of `deployments` records in order to make it a stateful object

See merge request gitlab-org/gitlab-ce!22380
```
  1cf4aa02
- Epic Vuex app specs · d9bb01ad
  Kushal Pandya authored Nov 06, 2018
  
  d9bb01ad