Commits · 858f83c0ef2f35438ec88358e145881a94563bd9 · nexedi / gitlab-ce

24 May, 2017 8 commits
- Fix eslint · 858f83c0
  Clement Ho authored May 24, 2017
  
  858f83c0
- Merge branch 'master' into 32563-remove-duplicated-config-code-for-filtered-search-dropdowns-ee · 0f45e150
  Clement Ho authored May 24, 2017
  
  0f45e150
- Merge branch 'wait-for-ajax-handling-all-js-requests-ee' into 'master' · 0aa1d715
  Douwe Maan authored May 24, 2017
```
Use wait_for_requests for checking Vue resource and $.ajax requests [EE]

See merge request !1923
```
  0aa1d715
- Merge branch 'ee-sentry-clientside-releases' into 'master' · e6d8c547
  Phil Hughes authored May 24, 2017
```
Apply patch of sentry-clientside-releases

See merge request !1959
```
  e6d8c547
- Merge branch 'docs/typo-issues-functionalities-ee' into 'master' · bf993f70
  Sean Packham (GitLab) authored May 24, 2017
```
Fix typo in issues_functionalities.md

See merge request !1971
```
  bf993f70
- Merge branch '2462-issue-board-modal-missing-weight-filter-in-filtered-search' into 'master' · 8563274b
  Phil Hughes authored May 24, 2017
```
Resolve "Issue board modal missing weight filter in filtered search"

Closes #2462

See merge request !1960
```
  8563274b
- 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 19 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
- Use wait_for_requests to wait all JS request · 1c42b35b
  Oswaldo Ferreira authored May 22, 2017
  
  1c42b35b
- 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
- Add spec for getKeys() · a7e0f810
  Clement Ho authored May 23, 2017
  
  a7e0f810
- 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
- Apply patch of sentry-clientside-releases · af139873
  Luke "Jared" Bennett authored May 22, 2017
  
  af139873
- Fix spec · f9d32b3a
  Clement Ho authored May 22, 2017
  
  f9d32b3a
- Add more details to Geo health check status message · b08831c4
  Stan Hu authored May 19, 2017
  
  b08831c4
- Fix eslint · c0880e22
  Clement Ho authored May 22, 2017
  
  c0880e22
- Add specs · f339d780
  Clement Ho authored May 22, 2017
  
  f339d780
- Show weight filter in issue board modal · 9ce3fa4c
  Clement Ho authored May 22, 2017
  
  9ce3fa4c
- 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 13 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
- Fix karma specs · 89b50aa6
  Clement Ho authored May 22, 2017
  
  89b50aa6
- 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
- Fix bugs and failing builds · f644cac6
  Clement Ho authored May 22, 2017
  
  f644cac6
- 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
- Fix eslint · fd31eeab
  Clement Ho authored May 22, 2017
  
  fd31eeab
- 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