Commits · 36c98d2411b7bb88c5ca46d0d3ec7deeaf2c94e1 · nexedi / gitlab-ce

22 May, 2018 28 commits
- Merge branch '5919_follow_up_on_5151_dismiss_vulnerability' into 'master' · 36c98d24
  Robert Speicher authored May 22, 2018
```
Resolve Follow up on dismiss vulnerability or create issue

See merge request gitlab-org/gitlab-ee!5756
```
  36c98d24
- Resolve Follow up on dismiss vulnerability or create issue · a79d5d85
  Olivier Gonzalez authored May 22, 2018
  
  a79d5d85
- Merge branch 'qa-246-not-checkouting-with-b' into 'master' · f13df5b4
  Grzegorz Bizon authored May 22, 2018
```
QA: Do not create a new branch in the second push

Closes gitlab-qa#246

See merge request gitlab-org/gitlab-ee!5799
```
  f13df5b4
- Merge branch '6114-move-some-features-projects-specs-ee' into 'master' · 5722d893
  Rémy Coutable authored May 22, 2018
```
Resolve "Extract EE specific files/lines for some projects features specs"

Closes #6114

See merge request gitlab-org/gitlab-ee!5802
```
  5722d893
- Make sure we're pushing to existing master branch · 67129d5d
  Lin Jen-Shin authored May 22, 2018
  
  67129d5d
- Unify spec/features/projects/user_sees_sidebar_spec.rb · fef9955e
  Lin Jen-Shin authored May 22, 2018
  
  fef9955e
- Unify spec/features/projects/show/developer_views_empty_project_instructions_spec.rb · 22932188
  Lin Jen-Shin authored May 22, 2018
  
  22932188
- Unify spec/features/projects/milestones/milestone_spec.rb · 999e2e07
  Lin Jen-Shin authored May 22, 2018
  
  999e2e07
- Unify spec/features/projects/members/member_leaves_project_spec.rb · 2d1e2da1
  Lin Jen-Shin authored May 22, 2018
  
  2d1e2da1
- Unify spec/features/projects/jobs_spec.rb · c96f4b96
  Lin Jen-Shin authored May 22, 2018
  
  c96f4b96
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · f1adf825
  Rémy Coutable authored May 22, 2018
```
CE upstream - 2018-05-22 09:40 UTC

See merge request gitlab-org/gitlab-ee!5800
```
  f1adf825
- Unify spec/features/projects/actve_tabs_spec.rb · 38f43812
  Lin Jen-Shin authored May 22, 2018
  
  38f43812
- Merge branch 'move-approvals-body-vue-component' into 'master' · 57c6bf60
  Phil Hughes authored May 22, 2018
```
Rename merge request widget author component

See merge request gitlab-org/gitlab-ee!5693
```
  57c6bf60
- Fix conflics for webpack.config.js · 2a192be2
  Filipa Lacerda authored May 22, 2018
  
  2a192be2
- Merge branch '6096-approvers-api-form-encoded' into 'master' · 22384605
  Douwe Maan authored May 22, 2018
```
Resolve "Approvers API does not work properly with form-encoded input"

Closes #6096

See merge request gitlab-org/gitlab-ee!5784
```
  22384605
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · 6a37f6f3
  GitLab Bot authored May 22, 2018
```
# Conflicts:
#	config/webpack.config.js

[ci skip]
```
  6a37f6f3
- A second push is not creating a new branch · c20e85b3
  Lin Jen-Shin authored May 22, 2018
```
Closes https://gitlab.com/gitlab-org/gitlab-qa/issues/246
```
  c20e85b3
- Merge branch 'move-link-to-member-avatar-vue-component' into 'master' · e012060b
  Phil Hughes authored May 22, 2018
```
Reorder LinkToMemberAvatar vue component props values

See merge request gitlab-org/gitlab-ee!5692
```
  e012060b
- Reorder LinkToMemberAvatar vue component props values · 9065a32b
  George Tsiolis authored May 22, 2018
  
  9065a32b
- Merge branch 'fj-46459-fix-expose-url-when-base-url-set' into 'master' · 67a12690
  Douwe Maan authored May 22, 2018
```
Fix `expose_url` helper does not include custom base url if it is set

Closes #46459

See merge request gitlab-org/gitlab-ce!19003
```
  67a12690
- Fix `expose_url` helper does not include custom base url if it is set · 0af4c56c
  Francisco Javier López authored May 22, 2018
  
  0af4c56c
- Merge branch 'ce-to-ee-2018-05-21' into 'master' · b74803d3
  Rémy Coutable authored May 22, 2018
```
CE upstream - 2018-05-21 15:29 UTC

See merge request gitlab-org/gitlab-ee!5789
```
  b74803d3
- Merge branch '45532-upgrade-vue-loader' into 'master' · 73572761
  Phil Hughes authored May 22, 2018
```
Resolve "Upgrade vue-loader for bug fixes and a simpler webpack config"

Closes #45532

See merge request gitlab-org/gitlab-ce!19052
```
  73572761
- Merge branch 'ee-45532-upgrade-vue-loader' into 'master' · 6f61580b
  Phil Hughes authored May 22, 2018
```
Port "Upgrade vue-loader for bug fixes and a simpler webpack config" to EE

See merge request gitlab-org/gitlab-ee!5779
```
  6f61580b
- Regenerated locale/gitlab.pot · ec1431ef
  Lin Jen-Shin authored May 22, 2018
  
  ec1431ef
- Merge branch 'ash.mckenzie/geo-rake-status-bugfix' into 'master' · cf82c176
  Nick Thomas authored May 22, 2018
```
When last Geo::EventLog is not available, geo:status rake task fails

See merge request gitlab-org/gitlab-ee!5786
```
  cf82c176
- When last Geo::EventLog is not available, geo:status rake task fails · c9769531
  Ash McKenzie authored May 21, 2018
  
  c9769531
- Merge branch 'jej/group-saml-metadata-disabled' into 'master' · 2d577d1c
  Nick Thomas authored May 22, 2018
```
Prevent access to Group SAML metadata/SLO endpoints

Closes #5900

See merge request gitlab-org/gitlab-ee!5765
```
  2d577d1c
21 May, 2018 12 commits
- Fix Approvals API not allowing empty params on form-encoded input · c9fca0f0
  Mario de la Ossa authored May 20, 2018
  
  c9fca0f0
- Update VERSION to 11.0.0-pre · c6f72ac9
  Mayra Cabrera authored May 21, 2018
  
  c6f72ac9
- Merge branch 'collapsed-contextual-nav-update' into 'master' · 54a64133
  Tim Zallmann authored May 21, 2018
```
Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level

See merge request gitlab-org/gitlab-ce!18996
```
  54a64133
- Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level · 3503dfe2
  Constance Okoghenun authored May 21, 2018
  
  3503dfe2
- Update VERSION to 10.9.0-pre · 87d2c77b
  Mayra Cabrera authored May 21, 2018
  
  87d2c77b
- Update CHANGELOG.md for 10.8.0 · 1c23c3ff
  Mayra Cabrera authored May 21, 2018
```
[ci skip]
```
  1c23c3ff
- Update CHANGELOG.md for 10.8.0 · 1189ecfc
  Mayra Cabrera authored May 21, 2018
```
[ci skip]
```
  1189ecfc
- Update CHANGELOG-EE.md for 10.8.0-ee · c1e08bc0
  Mayra Cabrera authored May 21, 2018
```
[ci skip]
```
  c1e08bc0
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-21 · 3d7d0006
  GitLab Bot authored May 21, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  3d7d0006
- Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master' · 7e78eacd
  Nick Thomas authored May 21, 2018
```
Backport from EE: Adding Progressbar explicitly and spec extensions for it

See merge request gitlab-org/gitlab-ce!18885
```
  7e78eacd
- Merge branch '5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master' · bdefdb44
  Nick Thomas authored May 21, 2018
```
Resolve "Geo: Rake task to force housekeeping on next sync"

Closes #5928

See merge request gitlab-org/gitlab-ee!5623
```
  bdefdb44
- Merge branch 'milestone-planning' into 'master' · 3857ab25
  🚄 Job van der Voort 🚀 authored May 21, 2018
```
add milestone planning to process doc

See merge request gitlab-org/gitlab-ee!5737
```
  3857ab25