Commits · f7c55b838e6cf43787d7efedf757a612376244a9 · nexedi / gitlab-ce

22 May, 2018 40 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · f7c55b83
  GitLab Bot authored May 22, 2018
  
  f7c55b83
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 87aef527
  Rémy Coutable authored May 22, 2018
```
CE upstream - 2018-05-22 12:51 UTC

See merge request gitlab-org/gitlab-ee!5804
```
  87aef527
- 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 'dm-xcode-project-directory' into 'master' · f8568baa
  Robert Speicher authored May 22, 2018
```
Fix Xcode project detection by looking for dirs instead of files

See merge request gitlab-org/gitlab-ce!19035
```
  f8568baa
- Merge branch 'fix/unverified-hover-state' into 'master' · 5045ca06
  Annabel Gray authored May 22, 2018
```
unverified hover state color changed to almost-black

See merge request gitlab-org/gitlab-ce!19031
```
  5045ca06
- unverified hover state color changed to almost-black · 683f9720
  Murat Dogan authored May 22, 2018
  
  683f9720
- Merge branch 'workhorse-4.2.1' into 'master' · f80ba922
  Alessio Caiazza authored May 22, 2018
```
Upgrade workhorse to v4.2.1

See merge request gitlab-org/gitlab-ce!19087
```
  f80ba922
- Merge branch 'dz-no-ee-check' into 'master' · 0c977d17
  Rémy Coutable authored May 22, 2018
```
Add check for top-level ee directory in CE repo

Closes #46239

See merge request gitlab-org/gitlab-ce!19062
```
  0c977d17
- 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
- Merge branch... · 86c155a1
  Douwe Maan authored May 22, 2018
```
Merge branch '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master'

Resolve "notifications broken during email address change before email confirmed"

Closes #22846

See merge request gitlab-org/gitlab-ce!18474
```
  86c155a1
- Merge branch 'ab-46530-mediumtext-for-gpg-keys' into 'master' · 45ec7d15
  Yorick Peterse authored May 22, 2018
```
Increase text limit for GPG keys (mysql only).

Closes #46530

See merge request gitlab-org/gitlab-ce!19069
```
  45ec7d15
- Upgrade workhorse to v4.2.1 · 49a9d9d8
  Alessio Caiazza authored May 22, 2018
  
  49a9d9d8
- Update no-ee-check with rubocop recommendation. · fba580e3
  Dmitriy Zaporozhets authored May 21, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fba580e3
- Merge branch 'sh-bump-prometheus-client-mmap' into 'master' · b884cfc6
  Nick Thomas authored May 22, 2018
```
Bump prometheus-client-mmap to 0.9.3 to fix nil exception error

See merge request gitlab-org/gitlab-ce!19085
```
  b884cfc6
- Bump prometheus-client-mmap to 0.9.3 to fix nil exception error · 6cd1f4b8
  Stan Hu authored May 22, 2018
```
See https://gitlab.com/gitlab-org/prometheus-client-mmap/issues/24
```
  6cd1f4b8
- Increase text limit for GPG keys (mysql only). · d8d30f8c
  Andreas Brandl authored May 21, 2018
```
Closes #46530.
```
  d8d30f8c
- 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 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 'ce-6114-move-some-features-projects-specs' into 'master' · ff5f3560
  Rémy Coutable authored May 22, 2018
```
CE: Resolve "Extract EE specific files/lines for some projects features specs"

See merge request gitlab-org/gitlab-ce!19084
```
  ff5f3560
- 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
- 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
- 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
- Don't set the notification_email when only unconfirmed_email is changed · 3f73b6be
  Rémy Coutable authored Apr 19, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3f73b6be
- 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/blobs/blob_show_spec.rb · 2b92cca8
  Lin Jen-Shin authored May 22, 2018
  
  2b92cca8
- Unify spec/features/projects/actve_tabs_spec.rb · 38f43812
  Lin Jen-Shin authored May 22, 2018
  
  38f43812
- Fix Xcode project detection by looking for dirs instead of files · 83cda43a
  Douwe Maan authored May 18, 2018
  
  83cda43a