Commits · d39b3d4b8d2d4c5ded46182a5353c68a8f5bb5cd · nexedi / gitlab-ce

03 May, 2018 9 commits
- Merge branch 'master' into feature/runner-per-group · d39b3d4b
  Dylan Griffith authored May 03, 2018
  
  d39b3d4b
- Make assertions about runner_type in spec/requests/api/runner_spec.rb · dcb67951
  Dylan Griffith authored May 03, 2018
  
  dcb67951
- Style improvements to spec/models/project_spec.rb · 67f25c62
  Dylan Griffith authored May 03, 2018
  
  67f25c62
- More style improvements to spec/models/ci/runner_spec.rb · a6c9db61
  Dylan Griffith authored May 03, 2018
  
  a6c9db61
- Merge branch 'docs-use-variables-deploy-policy-for-staging-and-production' into 'master' · 2c9568ed
  Achilleas Pipinellis authored May 03, 2018
```
Include documentation about STAGING_ENABLED variable for AutoDevops

See merge request gitlab-org/gitlab-ce!18675
```
  2c9568ed
- Include documentation about STAGING_ENABLED variable for AutoDevops · 1998f626
  Mayra Cabrera authored May 03, 2018
  
  1998f626
- Style changes to spec/models/ci/runner_spec.rb · 1f7f29b7
  Dylan Griffith authored May 03, 2018
  
  1f7f29b7
- Again fix db/schema.rb for ci_runner_namespaces · 80bcb376
  Dylan Griffith authored May 03, 2018
  
  80bcb376
- Fix db/schema.rb for add_foreign_key ci_runner_namespaces namespace_id · d188c7a2
  Dylan Griffith authored May 03, 2018
  
  d188c7a2
02 May, 2018 31 commits
- Merge branch 'winh-new-mergerequest-branch-picker' into 'master' · b2e1b709
  Clement Ho authored May 02, 2018
```
Load branches on new merge request page asynchronously

Closes #37477

See merge request gitlab-org/gitlab-ce!18315
```
  b2e1b709
- Load branches on new merge request page asynchronously · 244f511e
  Winnie Hellmann authored May 02, 2018
  
  244f511e
- Update CHANGELOG.md for 10.7.3 · 8bf03072
  Mayra Cabrera authored May 02, 2018
```
[ci skip]
```
  8bf03072
- Merge branch 'zj-repo-checksum-opt-out' into 'master' · 6b93fafb
  Robert Speicher authored May 02, 2018
```
Compute repository checksum by default

Closes gitaly#1146

See merge request gitlab-org/gitlab-ce!18648
```
  6b93fafb
- Merge branch 'tz-optimize-emoji-sprite' into 'master' · 8dcdb314
  Clement Ho authored May 02, 2018
```
Optimize Emoji Sprite Handling

See merge request gitlab-org/gitlab-ce!18576
```
  8dcdb314
- Optimize Emoji Sprite Handling · 77c47389
  Tim Zallmann authored May 02, 2018
  
  77c47389
- Merge branch 'revert-75f6e91f' into 'master' · c7c9f38d
  Phil Hughes authored May 02, 2018
```
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"

Closes #45979

See merge request gitlab-org/gitlab-ce!18692
```
  c7c9f38d
- Merge branch 'zj-namespace-service-mandatory' into 'master' · 66ba430d
  Douwe Maan authored May 02, 2018
```
Remove old GitLab Shell namespace actions implementations

See merge request gitlab-org/gitlab-ce!18681
```
  66ba430d
- Merge branch '45761-replace-actionview-time_ago_in_words' into 'master' · adec373f
  Rémy Coutable authored May 02, 2018
```
Deprecation of ActionView's time_ago_in_words

Closes #45761

See merge request gitlab-org/gitlab-ce!18607
```
  adec373f
- Merge branch 'increase-new-issue-metadata-form-margin' into 'master' · e662cab5
  Clement Ho authored May 02, 2018
```
Increase new issue metadata form margin

Closes #44134

See merge request gitlab-org/gitlab-ce!18630
```
  e662cab5
- Merge branch 'jprovazn-generic-error' into 'master' · 59f79383
  Nick Thomas authored May 02, 2018
```
Save and expose only generic merge error

See merge request gitlab-org/gitlab-ce!18646
```
  59f79383
- Rename RunnerGroup -> RunnerNamespace · 0970e7b9
  Dylan Griffith authored May 02, 2018
  
  0970e7b9
- Merge branch... · dbe12754
  Douwe Maan authored May 02, 2018
```
Merge branch '45970-broken-master-in-spec-features-issues-user_uses_slash_commands_spec-rb' into 'master'

Resolve "Broken master in spec/features/issues/user_uses_slash_commands_spec.rb"

Closes #45970

See merge request gitlab-org/gitlab-ce!18687
```
  dbe12754
- Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'" · 1f08fab4
  Rémy Coutable authored May 02, 2018
```
This reverts merge request !18682
```
  1f08fab4
- Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master' · 6187dc24
  Mike Greiling authored May 02, 2018
```
Move WorkInProgress vue component

See merge request gitlab-org/gitlab-ce!17536
```
  6187dc24
- Merge branch 'refactor/move-sidebar-time-tracking-vue-component' into 'master' · e35c38e3
  Filipa Lacerda authored May 02, 2018
```
Move SidebarTimeTracking vue component

See merge request gitlab-org/gitlab-ce!18677
```
  e35c38e3
- Rename Runner#invalidate_build_cache -> Runner#pick_build · 2261188f
  Dylan Griffith authored May 02, 2018
  
  2261188f
- Merge branch 'refactor/move-no-tracking-pane-vue-component' into 'master' · 850a6c65
  Phil Hughes authored May 02, 2018
```
Move TimeTrackingNoTrackingPane vue component

See merge request gitlab-org/gitlab-ce!18676
```
  850a6c65
- Make sure the user is logged out before they're logged in again · f6bfee6b
  Rémy Coutable authored May 02, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f6bfee6b
- Merge branch '5480-sidebar-subscription-event-handling' into 'master' · 75f6e91f
  Phil Hughes authored May 02, 2018
```
Platform: Use component to emit event on Subscription toggle component instead of eventHub

See merge request gitlab-org/gitlab-ce!18682
```
  75f6e91f
- Remove old GitLab Shell implementation · 12be728b
  Zeger-Jan van de Weg authored May 02, 2018
```
Moves the calls to Gitaly, no matter what the feature flag values are.
```
  12be728b
- Consume `toggleSubscription` event directly from Subscriptions component · aa0a35a8
  Kushal Pandya authored May 02, 2018
  
  aa0a35a8
- Emit `toggleSubscription` event on component instead of eventHub · de3194bf
  Kushal Pandya authored May 02, 2018
  
  de3194bf
- Move SidebarTimeTracking vue component · 751302a1
  George Tsiolis authored May 02, 2018
  
  751302a1
- Merge branch 'improve-quick-actions-summary-preview' into 'master' · a7f07693
  Tim Zallmann authored May 02, 2018
```
Improve quick actions summary preview

Closes #45892

See merge request gitlab-org/gitlab-ce!18659
```
  a7f07693
- Merge branch 'blackst0ne-replace-spinach-project-source-markdown-render.feature' into 'master' · c22a3fa0
  Rémy Coutable authored May 02, 2018
```
Replace the `project/source/markdown_render.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ce!18525
```
  c22a3fa0
- Replace the `project/source/markdown_render.feature` spinach test with an rspec analog · 4155df1c
  blackst0ne authored May 02, 2018
  
  4155df1c
- Merge branch 'blackst0ne-rails5-fix-create-service-spec' into 'master' · 8d74af10
  Rémy Coutable authored May 02, 2018
```
[Rails5] Fix spec/services/applications/create_service_spec.rb

See merge request gitlab-org/gitlab-ce!18665
```
  8d74af10
- [Rails5] Fix spec/services/applications/create_service_spec.rb · 2bf94980
  blackst0ne authored May 02, 2018
  
  2bf94980
- Merge branch 'blackst0ne-rails5-fix-notification-setting-spec' into 'master' · bdb238a0
  Rémy Coutable authored May 02, 2018
```
[Rails5] Fix spec/models/notification_setting_spec.rb

See merge request gitlab-org/gitlab-ce!18664
```
  bdb238a0
- Merge branch 'blackst0ne-rails5-fix-enum-question-mark-methods' into 'master' · 2fe82443
  Rémy Coutable authored May 02, 2018
```
[Rails5] Fix enum question mark methods

See merge request gitlab-org/gitlab-ce!18662
```
  2fe82443