Commits · bf30d2586a67f5899e7b819f27f75f255fa6c96b · nexedi / gitlab-ce

20 Jul, 2018 20 commits
- Resolve "Geo: Add repository verification failures to API" · bf30d258
  Valery Sizov authored Jul 20, 2018
  
  bf30d258
- Merge branch 'dennis-move-droplab-filtered-search-ee-features' into 'master' · 50a8acda
  Fatih Acet authored Jul 20, 2018
```
move EE-only droplab/filtered search features to ee/

See merge request gitlab-org/gitlab-ee!6610
```
  50a8acda
- move EE-only droplab/filtered search features to ee/ · e1c04f98
  Dennis Tang authored Jul 20, 2018
  
  e1c04f98
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · ee7069e5
  Filipa Lacerda authored Jul 20, 2018
```
CE upstream - 2018-07-20 09:21 UTC

See merge request gitlab-org/gitlab-ee!6604
```
  ee7069e5
- Update CHANGELOG.md for 11.1.0 · 48d70a72
  GitLab Release Tools Bot authored Jul 20, 2018
```
[ci skip]
```
  48d70a72
- Update CHANGELOG-EE.md for 11.1.0-ee · 29932621
  GitLab Release Tools Bot authored Jul 20, 2018
```
[ci skip]
```
  29932621
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · 7afdcc7f
  GitLab Bot authored Jul 20, 2018
  
  7afdcc7f
- Merge branch 'gitaly-remote-mandatory' into 'master' · a14f1720
  Sean McGivern authored Jul 20, 2018
```
Migrate add_remote, remove_remote, fetch_internal_remote to gitaly

See merge request gitlab-org/gitlab-ce!20724
```
  a14f1720
- Merge branch 'ee-gitaly-remote-mandatory' into 'master' · eab6aa25
  Sean McGivern authored Jul 20, 2018
```
Migrate add_remote, remove_remote, fetch_internal_remote to gitaly

See merge request gitlab-org/gitlab-ee!6596
```
  eab6aa25
- Merge branch 'project-dropdown-list-overflow' into 'master' · 71a67cfb
  Phil Hughes authored Jul 20, 2018
```
Don't overflow project/group dropdown results

Closes #49382 and #49379

See merge request gitlab-org/gitlab-ce!20704
```
  71a67cfb
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · ba1106f1
  Stan Hu authored Jul 20, 2018
```
CE upstream - 2018-07-20 05:29 UTC

See merge request gitlab-org/gitlab-ee!6601
```
  ba1106f1
- Merge branch '48036-fix-web-ide-blob-crash' into 'master' · 6836d732
  Phil Hughes authored Jul 20, 2018
```
Resolve "Web IDE crashes for directories named "blob""

Closes #48036

See merge request gitlab-org/gitlab-ce!20712
```
  6836d732
- Merge branch '49375-css-move-ee' into 'master' · 6a86a825
  Phil Hughes authored Jul 20, 2018
```
Moves CSS of security reports into CE folder

See merge request gitlab-org/gitlab-ee!6579
```
  6a86a825
- Moves CSS of security reports into CE folder · 7add737a
  Filipa Lacerda authored Jul 20, 2018
  
  7add737a
- Merge branch '49375-css-move' into 'master' · 2fee11ba
  Phil Hughes authored Jul 20, 2018
```
Moves CSS of security reports into CE folder

See merge request gitlab-org/gitlab-ce!20696
```
  2fee11ba
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · fb870c71
  GitLab Bot authored Jul 20, 2018
  
  fb870c71
- Merge branch 'ce-to-ee-2018-07-19' into 'master' · 9ed92067
  Stan Hu authored Jul 20, 2018
```
CE upstream - 2018-07-19 15:22 UTC

See merge request gitlab-org/gitlab-ee!6593
```
  9ed92067
- Merge branch '6964-geo-unable-to-disable-verification-on-the-secondary' into 'master' · 30cd7f4d
  Stan Hu authored Jul 20, 2018
```
Resolve "Geo: Unable to disable verification on the secondary"

Closes #6964

See merge request gitlab-org/gitlab-ee!6599
```
  30cd7f4d
- Add CHANGELOG · 0e501e9e
  Douglas Barbosa Alexandre authored Jul 19, 2018
  
  0e501e9e
- Use string rather than a symbol as feature flag name · 5709ac0e
  Douglas Barbosa Alexandre authored Jul 19, 2018
  
  5709ac0e
19 Jul, 2018 20 commits
- Don't overflow project/group dropdown results · c3ea0c02
  gfyoung authored Jul 18, 2018
```
Closes #49382.
```
  c3ea0c02
- Migrate add_remote, remove_remote, fetch_internal_remote to gitaly · fa1ea656
  Alejandro Rodríguez authored Jul 19, 2018
  
  fa1ea656
- Migrate add_remote, remove_remote, fetch_internal_remote to gitaly · 515b7028
  Alejandro Rodríguez authored Jul 19, 2018
  
  515b7028
- Fix Web IDE router breaking on files matching "targetmode" · 13337714
  Paul Slaughter authored Jul 19, 2018
  
  13337714
- Merge branch 'sh-add-logcursor-debugging' into 'master' · b00cced7
  Douglas Barbosa Alexandre authored Jul 19, 2018
```
Add additional logging for Geo Log Cursor

See merge request gitlab-org/gitlab-ee!6513
```
  b00cced7
- Merge branch '5594-geo-add-repository-verification-failures-to-api' into 'master' · b60364c0
  Douglas Barbosa Alexandre authored Jul 19, 2018
```
Backport of gitlab-org/gitlab-ee!6137

See merge request gitlab-org/gitlab-ce!20699
```
  b60364c0
- Backport of gitlab-org/gitlab-ee!6137 · c3c7f26a
  Valery Sizov authored Jul 19, 2018
  
  c3c7f26a
- Merge branch 'gitaly-ff-branch-nil' into 'master' · 1df0a17a
  Rémy Coutable authored Jul 19, 2018
```
Add missing Gitaly branch_update nil checks

Closes #49263

See merge request gitlab-org/gitlab-ce!20711
```
  1df0a17a
- Add missing Gitaly branch_update nil checks · 805de7fb
  Jacob Vosmaer (GitLab) authored Jul 19, 2018
  
  805de7fb
- Merge branch 'rc-3871-move-spec-javascripts-add_gitlab_slack_application-to-ee' into 'master' · 6cc68e39
  Mike Greiling authored Jul 19, 2018
```
Move a first batch of EE-specific JS specs to ee/spec/javascripts

See merge request gitlab-org/gitlab-ee!6454
```
  6cc68e39
- Add additional logging for Geo Log Cursor · b73e6b4c
  Stan Hu authored Jul 14, 2018
```
1. Log the batch of IDs taken
2. Log when a gap in the event sequence is detected
```
  b73e6b4c
- Merge branch 'add-total-time-flat-printer-for-profiling' into 'master' · be2410ab
  Rémy Coutable authored Jul 19, 2018
```
Add a Gitlab::Profiler.print_by_total_time convenience method

See merge request gitlab-org/gitlab-ce!20715
```
  be2410ab
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-19 · 8afd76e7
  GitLab Bot authored Jul 19, 2018
  
  8afd76e7
- Merge branch '49413-test-action-no-return' into 'master' · 91fcb311
  Filipa Lacerda authored Jul 19, 2018
```
Allow testAction to work for async actions that don't return a Promise

Closes #49413

See merge request gitlab-org/gitlab-ce!20718
```
  91fcb311
- Add a Gitlab::Profiler.print_by_total_time convenience method · ef973f6f
  Sean McGivern authored Jul 19, 2018
```
This method uses Gitlab::Profiler::TotalTimeFlatPrinter internally, which is the
same as RubyProf::FlatPrinter, but the min_percent option (and new max_percent
option) applies to the _total_ time, not the _self_ time. This helps us figure
out if we're calling a library inefficiently, for instance.
```
  ef973f6f
- Merge branch 'frozen-string-enable-apps-services-inner-even-more' into 'master' · daa1ac0f
  Rémy Coutable authored Jul 19, 2018
```
Enable more frozen string in app/services/**/*.rb

See merge request gitlab-org/gitlab-ce!20702
```
  daa1ac0f
- Merge branch 'rails5-fix-loadbalancing-host-spec' into 'master' · 01851e66
  Yorick Peterse authored Jul 19, 2018
```
Rails 5 fix NoMethodError: undefined method 'message' for nil:NilClass in host_spec.rb

See merge request gitlab-org/gitlab-ee!6589
```
  01851e66
- Merge branch 'ce-to-ee-2018-07-19' into 'master' · 3055a7d5
  Stan Hu authored Jul 19, 2018
```
CE upstream - 2018-07-19 12:22 UTC

See merge request gitlab-org/gitlab-ee!6592
```
  3055a7d5
- allow for testAction to wait until all promises are resolved · 0bb1009c
  Lukas Eipert authored Jul 19, 2018
  
  0bb1009c
- Merge branch 'rails5-fix-6930' into 'master' · 1224b2fb
  Sean McGivern authored Jul 19, 2018
```
Rails5 fix no implicit conversion of Symbol into Integer

Closes #6930

See merge request gitlab-org/gitlab-ee!6582
```
  1224b2fb