Commits · 6696fa8f71f9ae4416444515dbac43ffd447e54a · nexedi / gitlab-ce

20 Sep, 2017 2 commits
- Document another gotcha with the ::EE namespace · 6696fa8f
  Nick Thomas authored Sep 20, 2017
  
  6696fa8f
- Merge branch '37713-enable-ee_compat_check-for-forks-ee' into 'master' · 945598aa
  Rémy Coutable authored Sep 20, 2017
```
Enable ee_compat_check for forks, but not EE

See merge request gitlab-org/gitlab-ee!2927
```
  945598aa
19 Sep, 2017 26 commits
- Merge branch 'ee-reoganize-deployment-indexes' into 'master' · f5751008
  Yorick Peterse authored Sep 19, 2017
```
EE: Reorganize indexes for the "deployments" table

Closes gitlab-ce#36877

See merge request gitlab-org/gitlab-ee!2955
```
  f5751008
- Merge branch 'do-not-perform-disk-check-ee' into 'master' · a0dd8010
  Stan Hu authored Sep 19, 2017
```
Do not perform hard check (presence of file on storage)

Closes gitlab-ce#37945

See merge request gitlab-org/gitlab-ee!2960
```
  a0dd8010
- Fix bad merge in app/models/environment.rb · bb62a7bf
  Stan Hu authored Sep 19, 2017
  
  bb62a7bf
- Reorganize indexes for the "deployments" table · 781eb463
  Stan Hu authored Sep 19, 2017
```
This removes the need for a default scope that adds a "WHERE project_id
= X" clause. This commit also includes an additional index for
Environment#last_deployment, ensuring this query uses just an index scan
instead of also applying a Filter.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36877
```
  781eb463
- Merge branch 'jej/lfs-object-storage-docs' into 'master' · 1a5db2eb
  Douwe Maan authored Sep 19, 2017
```
Documentation for LFS object storage

See merge request gitlab-org/gitlab-ee!2959
```
  1a5db2eb
- Documentation for LFS object storage · 3f1dd726
  James Edwards-Jones authored Sep 19, 2017
  
  3f1dd726
- Do not perform hard check (presence of file on storage) · c504e6d6
  Kamil Trzcinski authored Sep 19, 2017
```
Instead perform soft check (the column set to indicate that file does exist)
```
  c504e6d6
- Merge branch 'path-locks-spec-fix' into 'master' · 2fa8d881
  Rémy Coutable authored Sep 19, 2017
```
fix transient failure in path_locks_spec.rb

See merge request gitlab-org/gitlab-ee!2944
```
  2fa8d881
- Merge branch 'ce-to-ee' into 'master' · 9d7d845a
  Dmitriy Zaporozhets authored Sep 19, 2017
```
CE Upstream - Monday

Closes gitaly#559, gitlab-ce#37916, and gitlab-ce#36877

See merge request gitlab-org/gitlab-ee!2948
```
  9d7d845a
- Merge branch 'ee-gitaly-n-plus-1-detection' into 'master' · 56c08c37
  Rémy Coutable authored Sep 19, 2017
```
Detect n+1 issues involving Gitaly

See merge request gitlab-org/gitlab-ee!2924
```
  56c08c37
- Detect n+1 issues involving Gitaly · 77d67412
  Andrew Newdigate authored Sep 19, 2017
  
  77d67412
- Fix spec/services/projects/update_service_spec.rb · 3d39262d
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3d39262d
- Fix spec/ee/spec/controllers/autocomplete_controller_spec.rb · 127b4557
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  127b4557
- Merge branch 'sh-require-geo-ssh-db' into 'master' · 780cb31d
  Nick Thomas authored Sep 19, 2017
```
Add upgrade notes for Geo in GitLab 10.0

See merge request gitlab-org/gitlab-ee!2951
```
  780cb31d
- Resolve conflict in spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb · 07f37e01
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  07f37e01
- Resolve conflict in spec/models/repository_spec.rb · 40672fb5
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  40672fb5
- Remove unneeded feature files · 5cfad0b2
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5cfad0b2
- Resolve conflict in app/models/ci/pipeline.rb · 7e2a039b
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7e2a039b
- Resolve conflict in db/schema.rb · 0b77a17c
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0b77a17c
- Resolve conflict in app/views/layouts/nav/sidebar/_project.html.haml · f07a3504
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f07a3504
- Resolve conflict in app/views/layouts/nav/sidebar/_admin.html.haml · 2aec9fcc
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2aec9fcc
- Resolve conflict in app/models/repository.rb · f7678eed
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f7678eed
- Resolve conflict in app/controllers/autocomplete_controller.rb · 9653ff7a
  Rémy Coutable authored Sep 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9653ff7a
- Add upgrade notes for Geo in GitLab 10.0 · b215c59d
  Stan Hu authored Sep 18, 2017
```
[ci skip]
```
  b215c59d
- Merge branch 'jlh-expand-license' into 'master' · ad98fb1f
  Jacob Schatz authored Sep 19, 2017
```
- Expand EE license use for development and testing

See merge request gitlab-org/gitlab-ee!2935
```
  ad98fb1f
- Merge branch 'ee-37259-some-mr-ready-mobile-fixes' into 'master' · 3d6bbf44
  Fatih Acet authored Sep 19, 2017
```
Fix MR ready to merge buttons/controls at mobile breakpoint -- EE merge edition

Closes gitlab-ce#37259

See merge request gitlab-org/gitlab-ee!2923
```
  3d6bbf44
18 Sep, 2017 12 commits
- Fix MR ready to merge buttons/controls at mobile breakpoint · 5149f6f0
  Eric Eastwood authored Sep 12, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37259

Conflicts:
	app/assets/stylesheets/pages/merge_requests.scss
```
  5149f6f0
- Merge branch 'ee-33287-fix-mr-widget-errors-with-external-services' into 'master' · 93d62cca
  Fatih Acet authored Sep 18, 2017
```
Fix MR widget with external CI services/integrations -- EE merge edition

Closes gitlab-ce#33287

See merge request gitlab-org/gitlab-ee!2922
```
  93d62cca
- Fix merge conflicts from CE upstream · 580f19b8
  kushalpandya authored Sep 18, 2017
  
  580f19b8
- Resolve conflict in app/controllers/boards/issues_controller.rb · 8eea4504
  Micaël Bergeron authored Sep 18, 2017
  
  8eea4504
- Resolve conflict in app/assets/javascripts/filtered_search/dropdown_user.js · 313f7903
  Rémy Coutable authored Sep 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  313f7903
- Merge branch 'update-geo-database-ssh-keys' into 'master' · 8b6c8a74
  Stan Hu authored Sep 18, 2017
```
Update SSH database lookup instructions for CentOS 7.4

See merge request gitlab-org/gitlab-ee!2946
```
  8b6c8a74
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 1b3de2f5
  Dmitriy Zaporozhets authored Sep 18, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1b3de2f5
- Merge branch 'sh-optimize-discussion-json' into 'master' · 9b137533
  Yorick Peterse authored Sep 18, 2017
```
Eliminate N+1 queries in loading discussions.json endpoint

Closes #37955

See merge request gitlab-org/gitlab-ce!14327
```
  9b137533
- Merge branch '37590-pipelines-mr' into 'master' · cffb325e
  Annabel Dunstone Gray authored Sep 18, 2017
```
Fix mini graph pipeline breaking in merge request view

Closes #37590

See merge request gitlab-org/gitlab-ce!14306
```
  cffb325e
- Merge branch 'ce-to-ee-2017-09-13' into 'master' · 82d20621
  Rémy Coutable authored Sep 18, 2017
```
CE upstream - Wednesday

Closes gitlab-ce#37652, gitaly#519, gitlab-ce#37653, #3389, gitlab-ce#37648 et gitlab-ce#35990

See merge request gitlab-org/gitlab-ee!2906
```
  82d20621
- Merge branch 'winh-missing-javascript-imports' into 'master' · fc8cd631
  Tim Zallmann authored Sep 18, 2017
```
Add missing import statements

See merge request gitlab-org/gitlab-ce!14209
```
  fc8cd631
- Merge branch 'milestone-avatar-issuable-link' into 'master' · 4197cd8c
  Tim Zallmann authored Sep 18, 2017
```
Fixes milestone issuable assignee URL

Closes #33124

See merge request gitlab-org/gitlab-ce!14292
```
  4197cd8c