Commits · 68b5cd71e0d8bdf39a71ad2dfd5de55f6b7aa91f · Forest Godfrey / gitlab-ce

23 May, 2018 12 commits
- Merge branch 'gitaly-import-project-opt-out' into 'master' · 68b5cd71
  Douwe Maan authored May 23, 2018
```
Move ImportProject to OptOut in Gitaly

See merge request gitlab-org/gitlab-ce!19090
```
  68b5cd71
- Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master' · 18ed49c9
  Douwe Maan authored May 23, 2018
```
Move Repository#info_attributes to OptOut in gitaly

See merge request gitlab-org/gitlab-ce!19092
```
  18ed49c9
- Merge branch… · 7f484cd1
  Douwe Maan authored May 23, 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
```
  7f484cd1
- Merge branch '46354-deprecate_gemnasium_service' into 'master' · b71c990a
  Douwe Maan authored May 23, 2018
```
Resolve "Deprecate Gemnasium project service"

Closes #46354

See merge request gitlab-org/gitlab-ce!18954
```
  b71c990a
- Resolve "Deprecate Gemnasium project service" · 40dd12c7
  Olivier Gonzalez authored May 23, 2018
  
  40dd12c7
- Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'master' · f0fbdad9
  Douwe Maan authored May 23, 2018
```
Resolve "Web IDE doesn't work for branches with slashes"

Closes #45530

See merge request gitlab-org/gitlab-ce!18878
```
  f0fbdad9
- Resolve "Web IDE doesn't work for branches with slashes" · 8056a77d
  Tim Zallmann authored May 23, 2018
  
  8056a77d
- Merge branch 'ide-commit-state-bug' into 'master' · 3a3f542d
  Filipa Lacerda authored May 23, 2018
```
Fixed web IDE review & commit editors getting into incorrect state

Closes #46392

See merge request gitlab-org/gitlab-ce!19038
```
  3a3f542d
- Merge branch '46603-add-vue-loader-cache' into 'master' · 4ba8ff50
  Fatih Acet authored May 23, 2018
```
Resolve "Add vue-loader compile caching to frontend build process"

Closes #46603

See merge request gitlab-org/gitlab-ce!19099
```
  4ba8ff50
- Merge branch 'ide-jobs-list' into 'master' · 7e1e3559
  Filipa Lacerda authored May 23, 2018
```
Pipelines store actions & states in web IDE

Closes #44604

See merge request gitlab-org/gitlab-ce!18912
```
  7e1e3559
- Merge branch 'ide-file-finder-improve-order' into 'master' · 1623e4ac
  Filipa Lacerda authored May 23, 2018
```
Fixed IDE file finder ordering

See merge request gitlab-org/gitlab-ce!18948
```
  1623e4ac
- fixed spec · fff2b4f6
  Phil Hughes authored May 23, 2018
  
  fff2b4f6
22 May, 2018 28 commits
- add file cache to vue-loader to speed up compilation · 7774b318
  Mike Greiling authored May 22, 2018
  
  7774b318
- Merge branch '44895-explicit-merge-conflict' into 'master' · 76e276cb
  Tim Zallmann authored May 22, 2018
```
Resolve "Make explicit that merge conflict feature commits to source branch"

Closes #44895

See merge request gitlab-org/gitlab-ce!18921
```
  76e276cb
- Merge branch 'winh-make-it-right-now' into 'master' · 4c63e904
  Annabel Gray authored May 22, 2018
```
Use "right now" for short time periods

Closes #40563

See merge request gitlab-org/gitlab-ce!19095
```
  4c63e904
- Use "right now" for short time periods · 1d6025fd
  Winnie Hellmann authored May 22, 2018
  
  1d6025fd
- 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
- added spec · 23a7c389
  Phil Hughes authored May 22, 2018
  
  23a7c389
- 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
- Move Repository#info_attributes to OptOut in gitaly · f0ef31a1
  Kim Carlbäcker authored May 22, 2018
  
  f0ef31a1
- 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
- Move ImportProject to OptOut in Gitaly · 2a781f7f
  Kim Carlbäcker authored May 22, 2018
  
  2a781f7f
- 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
- changed what bit of code stops the callback · a7ea0e6b
  Phil Hughes authored May 22, 2018
  
  a7ea0e6b
- 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
- 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 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
- 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
- Unify spec/features/projects/blobs/blob_show_spec.rb · 2b92cca8
  Lin Jen-Shin authored May 22, 2018
  
  2b92cca8
- group jobs into stages · ba907426
  Phil Hughes authored May 14, 2018
  
  ba907426