Commits · 125211ccc93783b779512c0d5b6c5af0847b8151 · nexedi / gitlab-ce

24 May, 2017 2 commits
- Fix typo in issues_functionalities.md · 125211cc
  Achilleas Pipinellis authored May 24, 2017
  
  125211cc
- Merge branch 'sh-fix-geo-iat-return-value' into 'master' · 2580620f
  Stan Hu authored May 24, 2017
```
Fix return value when Geo nodes are not in sync

See merge request !1969
```
  2580620f
23 May, 2017 12 commits
- Fix return value when Geo nodes are not in sync · fc2b346c
  Stan Hu authored May 23, 2017
```
Relates to #2469
```
  fc2b346c
- Update CHANGELOG.md for 9.2.1 · 3d4fc3dd
  Clement Ho authored May 23, 2017
```
[ci skip]
```
  3d4fc3dd
- Update CHANGELOG-EE.md for 9.2.1-ee · 7c123f2c
  Clement Ho authored May 23, 2017
```
[ci skip]
```
  7c123f2c
- Merge branch 'sh-geo-improve-node-status' into 'master' · 3013aa03
  Robert Speicher authored May 23, 2017
```
Add more details to Geo health check status message

See merge request !1951
```
  3013aa03
- Merge branch 'ce-to-ee-2017-05-17' into 'master' · cc572c43
  Valery Sizov authored May 23, 2017
```
CE upstream - Wednesday

Closes gitlab-ce#31902, gitaly#187, gitlab-ce#31932, gitaly#199, gitlab-ce#32125, #2128, gitaly#224, gitlab-ce#32096, gitlab-ce#32087, and omnibus-gitlab#2326

See merge request !1920
```
  cc572c43
- Merge branch 'docs/rm-superpowers-ee' into 'master' · 1fe0c587
  Sean Packham (GitLab) authored May 23, 2017
```
Move docs 'superpowers' items to their respective sections

See merge request !1965
```
  1fe0c587
- Move docs 'superpowers' items to respective sections · 0c625fc7
  Achilleas Pipinellis authored May 23, 2017
  
  0c625fc7
- Fix conflicts for doc/user/project/issues/issues_functionalities.md · 5a6ab710
  Achilleas Pipinellis authored May 23, 2017
  
  5a6ab710
- Resolve conflicts · 5bac0283
  Rémy Coutable authored May 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5bac0283
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-17 · 8a60982f
  Rémy Coutable authored May 23, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8a60982f
- Add more details to Geo health check status message · b08831c4
  Stan Hu authored May 19, 2017
  
  b08831c4
- Merge branch 'handle-transient-mr-query-count-spec-ee' into 'master' · 65effeb2
  Douwe Maan authored May 23, 2017
```
Handle transient MR query count spec [EE]

See merge request !1949
```
  65effeb2
22 May, 2017 26 commits
- Merge branch 'license-plan-check-on-namespaces' into 'master' · bb2a0453
  Douwe Maan authored May 22, 2017
```
License plan check on namespaces

See merge request !1961
```
  bb2a0453
- License plan check on namespaces · 6c25cadf
  Oswaldo Ferreira authored May 22, 2017
  
  6c25cadf
- Merge branch 'es_search_though_the_project_description' into 'master' · e72964c7
  Douwe Maan authored May 22, 2017
```
Elasticsearch searches through the project description

Closes #2367

See merge request !1899
```
  e72964c7
- Fix JS spec conflicts · babe1c71
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  babe1c71
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-17 · 7e5eab83
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7e5eab83
- Merge branch 'fix-advanced-search-syntax-link' into 'master' · 97f17efa
  Achilleas Pipinellis authored May 22, 2017
```
Fix the elasticsearch advanced search syntax link and edition details

See merge request !1958
```
  97f17efa
- Merge branch '2360-fix-mr-elasticsearch-by-iid' into 'master' · 316e9c12
  Rémy Coutable authored May 22, 2017
```
Fix the reference pattern for merge requests in elasticsearch

Closes #2360

See merge request !1833
```
  316e9c12
- Merge branch 'adopt-es-module-syntax-ee' into 'master' · 171beba9
  Filipa Lacerda authored May 22, 2017
```
Port of "Adopt ES module syntax" from CE to EE

See merge request !1913
```
  171beba9
- ES advanced search syntax is EES, not EEP · 44a7dc57
  Nick Thomas authored May 22, 2017
  
  44a7dc57
- Fix es group search specs · 524fa33a
  Annabel Dunstone Gray authored May 22, 2017
  
  524fa33a
- Fix the elasticsearch advanced search syntax link · 08fb91bb
  Nick Thomas authored May 22, 2017
  
  08fb91bb
- Update CHANGELOG.md for 9.2.0 · 92eecefd
  Lin Jen-Shin authored May 22, 2017
```
[ci skip]
```
  92eecefd
- Update CHANGELOG-EE.md for 9.2.0-ee · ab3ffc7e
  Lin Jen-Shin authored May 22, 2017
```
[ci skip]
```
  ab3ffc7e
- Merge branch 'docs/add-comment-snippets-ee' into 'master' · a45361e1
  Achilleas Pipinellis authored May 22, 2017
```
Adds "comments on snippets" to doc

See merge request !1956
```
  a45361e1
- Merge branch 'docs/issues-multiple-assignees-ee' into 'master' · c243af49
  Achilleas Pipinellis authored May 22, 2017
```
Add to docs: issues multiple assignees

Closes #2440

See merge request !1957
```
  c243af49
- Merge branch 'docs/issues-multiple-assignees' into 'master' · d1514777
  Sean Packham (GitLab) authored May 20, 2017
```
Add to docs: issues multiple assignees

Closes gitlab-ee#2440 and #32574

See merge request !11556
```
  d1514777
- Merge branch 'docs/add-comment-snippets' into 'master' · 5f4c42f3
  Sean Packham (GitLab) authored May 20, 2017
```
Adds "comments on snippets"  to doc

Closes #32575

See merge request !11563
```
  5f4c42f3
- Resolve conflicts · 1574a921
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1574a921
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-17 · 8486c8e5
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  8486c8e5
- Merge branch 'docs/deploys-perf-dashboard-ee' into 'master' · 32ea87d3
  Sean Packham (GitLab) authored May 22, 2017
```
Move environment monitoring to environments doc

See merge request !1952
```
  32ea87d3
- Fix Group#avatar_url spec · ac4cbf2e
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ac4cbf2e
- Fix gitlab:backup:create spec · 60b5db86
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  60b5db86
- Fix Projects::MergeRequestsController#show spec · bd722305
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bd722305
- Fix Environment#metrics spec · 4666b562
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4666b562
- Fix User#avatar_url spec and remove duplicate shared example files · 4771794b
  Rémy Coutable authored May 22, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  4771794b
- Fix the reference pattern for merge requests in elasticsearch · 970a029f
  Nick Thomas authored May 05, 2017
  
  970a029f