Commits · 1d6025fd96622b5230997511bc2e5391892f7d7f · nexedi / gitlab-ce

22 May, 2018 29 commits
- 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
- 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
- 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
- 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
- Fix Xcode project detection by looking for dirs instead of files · 83cda43a
  Douwe Maan authored May 18, 2018
  
  83cda43a
- 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
- 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 '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
21 May, 2018 11 commits
- 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
- Add feature-flag for keyset pagination. · f5c42031
  Andreas Brandl authored May 15, 2018
  
  f5c42031
- Add keyset pagination for API calls. · f8aee5b0
  Andreas Brandl authored Apr 25, 2018
```
Closes #45756.
```
  f8aee5b0
- Refactor and extract DefaultPaginationStrategy. · cc1d1411
  Andreas Brandl authored Apr 25, 2018
  
  cc1d1411
- Migration to add/drop primary key constraints for composite keys. · 82576518
  Andreas Brandl authored May 15, 2018
```
Closes #43706.
```
  82576518
- Add NOT NULL constraints to project_authorizations. · a0c79f9d
  Andreas Brandl authored May 17, 2018
```
Closes #32258.
```
  a0c79f9d
- 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