Commits · a40f2fd48fc7717f4725d70d803ed77a53cf16b1 · nexedi / gitlab-ce

22 May, 2018 38 commits
- They're not EE specific but a delay from CE -> EE · a40f2fd4
  Lin Jen-Shin authored May 23, 2018
  
  a40f2fd4
- Remove ee/spec/features/projects/active_tabs_spec.rb · 78e3f835
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  78e3f835
- Fix conflicts for mr_widget_author_spec.js · 5f3604ca
  Filipa Lacerda authored May 22, 2018
  
  5f3604ca
- Resolve conflict in spec/requests/api/projects_spec.rb · cc26483a
  Imre authored May 22, 2018
  
  cc26483a
- Resolve conflict in spec/models/project_spec.rb · 36c2c9a7
  Imre authored May 22, 2018
  
  36c2c9a7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · cb0da545
  GitLab Bot authored May 22, 2018
```
# Conflicts:
#	spec/javascripts/vue_mr_widget/components/mr_widget_author_spec.js
#	spec/models/project_spec.rb
#	spec/requests/api/projects_spec.rb

[ci skip]
```
  cb0da545
- 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
- Unify spec/features/projects/user_sees_sidebar_spec.rb · fef9955e
  Lin Jen-Shin authored May 22, 2018
  
  fef9955e
- Merge branch 'ab-42194-keyset-pagination' into 'master' · 4d3b313a
  Yorick Peterse authored May 22, 2018
```
API: Keyset pagination support

Closes #45756

See merge request gitlab-org/gitlab-ce!18584
```
  4d3b313a
- 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 'ab-43706-composite-primary-keys' into 'master' · 2c7095c8
  Yorick Peterse authored May 22, 2018
```
Migration to add primary key constraint for composite keys

Closes #43706 and #32258

See merge request gitlab-org/gitlab-ce!18980
```
  2c7095c8
- Merge branch '45827-expose_readme_url_in_project_api' into 'master' · 360ec74c
  Rémy Coutable authored May 22, 2018
```
Expose readme url in Project API

Closes #45827

See merge request gitlab-org/gitlab-ce!18960
```
  360ec74c
- Expose readme url in Project API · 10237d45
  Imre Farkas authored May 22, 2018
  
  10237d45
- 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
- Merge branch 'rename-merge-request-widget-author-component' into 'master' · 4d674bd3
  Phil Hughes authored May 22, 2018
```
Rename merge request widget author component

See merge request gitlab-org/gitlab-ce!19079
```
  4d674bd3
- Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into 'master' · 879ddf72
  Douwe Maan authored May 22, 2018
```
Fixed badge api endpoint route when relative_url is set

Closes #46411

See merge request gitlab-org/gitlab-ce!19004
```
  879ddf72
- Merge branch 'jira-clarify-docs' into 'master' · 8f159d92
  Achilleas Pipinellis authored May 22, 2018
```
Clarifying Jira documentaiton

See merge request gitlab-org/gitlab-ce!19046
```
  8f159d92
- Clarifying Jira documentaiton · 2abb06bc
  Aric Buerer authored May 22, 2018
  
  2abb06bc
- 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
- 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
- Rename merge request widget author component · 385c0779
  George Tsiolis authored May 22, 2018
  
  385c0779
- 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 2 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