Commits · 939f0088c6b205aaf9fe5f4fe9d993afa93ef6b2 · nexedi / gitlab-ce

16 May, 2017 3 commits
- Increase the number of additional queries for PipelinesController#show · 939f0088
  Rémy Coutable authored May 16, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  939f0088
- Merge branch 'ce-to-ee-2017-05-10-template-spec-fix' into 'ce-to-ee-2017-05-10' · 36c117e2
  Rémy Coutable authored May 16, 2017
```
attempt to fix spec

See merge request !1904
```
  36c117e2
- attempt to fix spec · ea0a31dc
  James Lopez authored May 16, 2017
  
  ea0a31dc
15 May, 2017 13 commits
- Fix JS specs · f1826bcf
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f1826bcf
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-10 · 9a38c2dc
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9a38c2dc
- Fix form spec · bfdcba75
  Clement Ho authored May 15, 2017
  
  bfdcba75
- Merge branch 'ee-fix-merge-request-show-component-z-indices' into 'master' · ceeb55df
  Annabel Dunstone Gray authored May 15, 2017
```
Port fix-merge-request-show-component-z-indices to EE

See merge request !1895
```
  ceeb55df
- Port fix-merge-request-show-component-z-indices to EE · 291398bb
  Luke "Jared" Bennett authored May 15, 2017
  
  291398bb
- Fix lock file spec · 0ae91de2
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0ae91de2
- Merge branch 'ee-30286-ci-badge-component' into 'master' · 20ba7d9c
  Phil Hughes authored May 15, 2017
```
Port of 30286-ci-badge-component to EE

See merge request !1878
```
  20ba7d9c
- Fix an EE-specific spec · 96f5089f
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  96f5089f
- Move shared examples to their correct place and create new helpers · 435a4698
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  435a4698
- Re-add the :push_code_to_protected_branches permission · f37b0081
  Rémy Coutable authored May 15, 2017
```
This was removed in gitlab-org/gitlab-ce!11000.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f37b0081
- Fix static analysis offenses · 23f1cafb
  Rémy Coutable authored May 15, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  23f1cafb
- Merge branch 'ee-31349-pipelines-vue' into 'master' · efb3f52f
  Phil Hughes authored May 15, 2017
```
Port of 31349-pipelines-vue to EE

See merge request !1856
```
  efb3f52f
- Port of 31349-pipelines-vue to EE · 703d2978
  Filipa Lacerda authored May 15, 2017
  
  703d2978
12 May, 2017 24 commits
- Update CHANGELOG.md for 9.1.4 · ad77cdb9
  Felipe Artur authored May 12, 2017
```
[ci skip]
```
  ad77cdb9
- Update CHANGELOG-EE.md for 9.1.4-ee · 857f77f9
  Felipe Artur authored May 12, 2017
```
[ci skip]
```
  857f77f9
- Merge branch 'patch-4' into 'master' · 459d060f
  Filipa Lacerda authored May 12, 2017
```
Fix formatting issue in fe_guide/vue.md.

See merge request !1894
```
  459d060f
- Update vue.md · d28a6191
  Bryce Johnson authored May 12, 2017
  
  d28a6191
- Merge branch 'remove-needless-bind-polyfills-ee' into 'master' · 3206902a
  Filipa Lacerda authored May 12, 2017
```
Port of "remove-needless-bind-polyfills" to EE

See merge request !1855
```
  3206902a
- Merge branch 'ee-fix-form_spec-failure-wait_for_ajax-unneeded-command' into 'master' · 1ba2609d
  Douwe Maan authored May 12, 2017
```
Fix form_spec.rb failure relating to wait_for_ajax and unneeded commands

See merge request !1888
```
  1ba2609d
- Fix formatting issue in fe_guide/vue.md. · ec979c83
  Bryce Johnson authored May 12, 2017
  
  ec979c83
- Add index_redirect_routes_path_for_link migration to setup_postgresql.rake · c4a17519
  Luke "Jared" Bennett authored May 08, 2017
  
  c4a17519
- Merge branch 'update_assignee_cache_counts_refactoring' into 'master' · 42699b0a
  Sean McGivern authored May 12, 2017
```
Move update_assignee_cache_counts to the service(port from CE)

See merge request !1887
```
  42699b0a
- Fix wait_for_ajax in describe block · 92761de3
  Luke "Jared" Bennett authored May 12, 2017
  
  92761de3
- Fix form_spec.rb failure relating to wait_for_ajax and unneeded commands · 6443395d
  Luke "Jared" Bennett authored May 12, 2017
  
  6443395d
- Move update_assignee_cache_counts to the service · 78ef2360
  Valery Sizov authored May 10, 2017
  
  78ef2360
- Fix conflicts · e140833b
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e140833b
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-10 · 0845f00a
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0845f00a
- Reduce complexity of TreeHelper#lock_file_link · 726914c2
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  726914c2
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee · df2d3773
  Marin Jankovski authored May 12, 2017
  
  df2d3773
- Fix specs conflicts · 23629867
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  23629867
- Fix Gitlab::Checks::ChangeAccess conflicts · f824edca
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f824edca
- Fix Spinach conflicts · 1bac3670
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1bac3670
- Fix db/schema.rb conflicts · 7ceb1d83
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7ceb1d83
- Fix views conflicts · e5f31fe0
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e5f31fe0
- Resolve controllers, helpers, presenters & serializers conflicts · e2b253dd
  Rémy Coutable authored May 12, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e2b253dd
- Fix Frontend conflicts · 0f335323
  Rémy Coutable authored May 12, 2017
```
[ci skip]
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0f335323
- Merge branch 'ee-32096-fix-new-branch-dropdown-position-size' into 'master' · f905490f
  Phil Hughes authored May 12, 2017
```
Fix new branch dropdown position and size -- EE merge edition

Closes gitlab-ce#32096

See merge request !1875
```
  f905490f