Commits · ef391d505bcbbbbb8a42b1ed30614f8dc07101c2 · nexedi / gitlab-ce

04 May, 2017 2 commits
- Merge remote-tracking branch 'origin/master' into ce-to-ee · ef391d50
  Rémy Coutable authored May 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ef391d50
- Disable the MR feature after creating the MRs in ES GlobalSearch specs · b362c774
  Rémy Coutable authored May 04, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b362c774
03 May, 2017 25 commits
- Merge branch 'further-attempt-to-fix-protected_tags_spec-ee' into 'master' · f420cde3
  Sean McGivern authored May 03, 2017
```
Try waiting for previous dropdown to definitly close before going to click

See merge request !1806
```
  f420cde3
- Add missing find · b58573a2
  Luke "Jared" Bennett authored May 03, 2017
  
  b58573a2
- Try waiting for previous dropdown to definitly close before going to click · 668c581a
  Luke "Jared" Bennett authored May 03, 2017
  
  668c581a
- Merge branch 'merge-gitlab-elasticsearch-git' into 'master' · 91db36b6
  Sean McGivern authored May 03, 2017
```
Import the gitlab-elasticsearch-git gem

Closes gitlab-elasticsearch-git#6

See merge request !1794
```
  91db36b6
- Merge branch 'docs/pipeline-grouping-ee' into 'master' · 9142821e
  Sean Packham (GitLab) authored May 03, 2017
```
Document pipeline grouping

See merge request !1757
```
  9142821e
- Merge branch 'docs/ldap-admin-guide-chris-ee' into 'master' · 20478ff4
  Achilleas Pipinellis authored May 03, 2017
```
How to Configure LDAP with GitLab EE

Closes #2101

See merge request !1784
```
  20478ff4
- How to Configure LDAP with GitLab EE · 539395a9
  Marcia Ramos authored May 03, 2017
  
  539395a9
- Fix avatar-related failures · 4b464eaa
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4b464eaa
- Merge branch 'fix-create_new_mr_spec-dropdown-transient-failure-ee' into 'master' · 21b4c1c2
  Sean McGivern authored May 03, 2017
```
find and match first dropdown before clicking

See merge request !1795
```
  21b4c1c2
- Fix failing spec · a0f8bcc2
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a0f8bcc2
- Make elastic_repo_indexer use the inlined gitlab-elasticsearch-git gem · c595bdc1
  Nick Thomas authored May 03, 2017
  
  c595bdc1
- Remove a mention of the gitlab-elasticsearch-git version file · 770f662a
  Nick Thomas authored May 03, 2017
  
  770f662a
- Rubocop fixups · 4af69aab
  Nick Thomas authored May 03, 2017
  
  4af69aab
- Import the gitlab-elasticsearch-git gem unmodified · 0670055f
  Nick Thomas authored May 03, 2017
  
  0670055f
- Merge branch '2253-support-more-es-versions' into 'master' · d2cf8335
  Sean McGivern authored May 03, 2017
```
Support more elasticsearch versions

Closes #2253

See merge request !1716
```
  d2cf8335
- Merge branch '1052-advanced-search-syntax' into 'master' · 6486cb01
  Sean McGivern authored May 03, 2017
```
Support advanced search queries using elasticsearch

Closes #2037

See merge request !1770
```
  6486cb01
- find and match first dropdown before clicking · a175cdbb
  Luke "Jared" Bennett authored May 03, 2017
  
  a175cdbb
- Support advanced search queries using elasticsearch · c557ab54
  Nick Thomas authored May 02, 2017
  
  c557ab54
- Fix wrong conflict resolution · 49213bfb
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  49213bfb
- Remove duplicated methods · 8842ee40
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8842ee40
- Resolve missed conflicts · 53e2b450
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  53e2b450
- Remove duplication from .gitlab-ci.yml · 04d1de81
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  04d1de81
- Resolve conflicts · 8c5a827c
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8c5a827c
- Merge remote-tracking branch 'origin/master' into ce-to-ee · 9d53199c
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9d53199c
- Fix conflict in spec/models/project_spec.rb · 0fd47563
  Rémy Coutable authored May 03, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0fd47563
02 May, 2017 13 commits
- Merge branch 'ee-fix-gitaly-not-found' into 'master' · ebe5fef5
  Douwe Maan authored May 02, 2017
```
Re-enable ref operations with gitaly after not-found fix

See merge request !1758
```
  ebe5fef5
- Merge branch 'rs-described_class-cop-2-ee' into 'master' · df6d6e98
  Douwe Maan authored May 02, 2017
```
[EE] Enable `RSpec/DescribedClass` cop and correct violations

See merge request !1721
```
  df6d6e98
- Merge branch 'ee-30272-bvl-reject-more-namespaces' into 'master' · ec097ac1
  Douwe Maan authored May 02, 2017
```
Port of "Reject more reserved paths" to EE

See merge request !1778
```
  ec097ac1
- Resolve test_env.rb conflicts · b815dc9b
  Sam Rose authored May 02, 2017
  
  b815dc9b
- Resolve conflicts related to blob viewers · 0bde54c3
  Douwe Maan authored May 02, 2017
  
  0bde54c3
- Merge branch 'fix-geo-rake-task-not-using-protocol' into 'master' · d368100f
  Robert Speicher authored May 02, 2017
```
Fix Geo geo:set_primary_node task not working with HTTPS

See merge request !1774
```
  d368100f
- Use the correct class for the CsvExport mailer spec · 3a963c37
  Robert Speicher authored May 02, 2017
  
  3a963c37
- Auto-correct `RSpec/DescribedClass` violations · 095ac7d3
  Robert Speicher authored May 01, 2017
  
  095ac7d3
- Enable `RSpec/DescribedClass` cop · e979674b
  Robert Speicher authored Apr 25, 2017
  
  e979674b
- Merge branch 'stop-using-sidekiq-cron-for-push-mirrors' into 'master' · b9208980
  Douwe Maan authored May 02, 2017
```
implements new logic for push mirrors to update on push

See merge request !1616
```
  b9208980
- Reject EE-specific group paths · 7cb36159
  Bob Van Landuyt authored May 02, 2017
  
  7cb36159
- Reject more reserved paths · f9c6430f
  Bob Van Landuyt authored May 02, 2017
```
And validate if new paths need to be added.

This is a port to EE of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10413 to EE
```
  f9c6430f
- Resolve .gitlab-ci.yml · 2db73289
  Rémy Coutable authored May 02, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2db73289