Commits · 1574a92196a5adcd7b7fe40f8b59356515b09b03 · nexedi / gitlab-ce

22 May, 2017 14 commits
- 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 issues/form_spec failure · 136eedcf
  Luke "Jared" Bennett authored May 22, 2017
  
  136eedcf
- Fix users_select failures · b409ae79
  Luke "Jared" Bennett authored May 22, 2017
  
  b409ae79
- Merge branch 'docs/artifacts-preview-ee' into 'master' · 0d6ec15f
  Sean Packham (GitLab) authored May 22, 2017
```
Add note about artifacts previewing in docs

See merge request !1954
```
  0d6ec15f
- Merge branch 'docs/elastic-advanced-search' into 'master' · dcc39b77
  Sean Packham (GitLab) authored May 22, 2017
```
Refactor advanced search syntax docs

See merge request !1953
```
  dcc39b77
- Add note about artifacts previewing in docs · e6044634
  Achilleas Pipinellis authored May 19, 2017
  
  e6044634
- Refactor advanced search syntax docs · bc9f9da7
  Achilleas Pipinellis authored May 21, 2017
```
- Rename doc to use underscores
- Mention in search index page
```
  bc9f9da7
21 May, 2017 3 commits
- Merge branch '2179-geo-docs' into 'master' · 6c6f451d
  Achilleas Pipinellis authored May 21, 2017
```
Remove redundant documented steps for Geo Setup

Closes #2179

See merge request !1737
```
  6c6f451d
- Remove redundant documented steps for Geo Setup · 5487dc83
  Gabriel Mazetto authored May 21, 2017
  
  5487dc83
- Move environment monitoring to environments doc · 92e053de
  Achilleas Pipinellis authored May 21, 2017
  
  92e053de
19 May, 2017 23 commits
- Fix conflicts · 70210cca
  Clement Ho authored May 19, 2017
  
  70210cca
- Merge branch 'revert-5bf3e7c2' into 'master' · c75f2792
  Clement Ho authored May 19, 2017
```
Revert "Merge branch 'multiple-assignee-docs' into 'master'"

See merge request !1946
```
  c75f2792
- Merge branch 'fix-approvals-button' into 'master' · dfdad8ab
  Douwe Maan authored May 19, 2017
```
Fix "Remove your approval" button visibility for merged MRs

Closes #2439

See merge request !1936
```
  dfdad8ab
- Merge branch 'ee-fix-issue-32506' into 'master' · e12582ec
  Douwe Maan authored May 19, 2017
```
Port of fix-issue-32506 to EE

See merge request !1944
```
  e12582ec
- Revert "Merge branch 'multiple-assignee-docs' into 'master'" · 289353a9
  Clement Ho authored May 19, 2017
```
This reverts merge request !1940
```
  289353a9
- Fix contribution analytics tab change check · 151a28dd
  Eric Eastwood authored May 19, 2017
```
See
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1920#note_30152541

Probably caused by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11464
```
  151a28dd
- Fix mr_widget_header.js conflict · e63280fa
  Jose Ivan Vargas authored May 19, 2017
  
  e63280fa
- Resolve an easy doc conflict · 5dd836e0
  Rémy Coutable authored May 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5dd836e0
- Fix some conflicts · b8fba958
  Rémy Coutable authored May 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b8fba958
- Port of fix-issue-32506 to EE · 1b9cb467
  Michael Kozono authored May 19, 2017
  
  1b9cb467
- Merge remote-tracking branch 'origin/master' into ce-to-ee-2017-05-17 · 00df1306
  Rémy Coutable authored May 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  00df1306
- Re-add JenkinsDeprecatedService in API::Services · 0a1885a6
  Rémy Coutable authored May 19, 2017
```
This was mistakenly removed in 84597951.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0a1885a6
- Fix UsersFinder#by_non_ldap · 13e35f25
  Rémy Coutable authored May 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  13e35f25
- Merge branch '32536-mr-widget-performance-improvements-ee' into 'master' · 322af127
  Fatih Acet authored May 19, 2017
```
Load improvements related to MR widget [EE]

See merge request !1935
```
  322af127
- Merge branch 'multiple-assignee-docs' into 'master' · 5bf3e7c2
  Clement Ho authored May 19, 2017
```
Update docs for multiple assignees

See merge request !1940
```
  5bf3e7c2
- Merge branch 'ee-fix-header-z-index' into 'master' · 5bdf78cf
  Annabel Dunstone Gray authored May 19, 2017
```
Set navbar-gitlab z-index to 400

See merge request !1938
```
  5bdf78cf
- Instantiate UsersSelect in the dispatcher for projects:edit · 93138913
  Rémy Coutable authored May 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  93138913
- Update issues_functionalities.md · f442dcdb
  Victor Wu authored May 19, 2017
  
  f442dcdb
- Merge branch 'mr-widget-approvals-improvement' into 'master' · b53b5f5c
  Filipa Lacerda authored May 19, 2017
```
MRWidget: Remove approved from serializer.

See merge request !1933
```
  b53b5f5c
- Backport gitlab-ce!11518 MR widget perf improvement · 57c87b1e
  Oswaldo Ferreira authored May 18, 2017
  
  57c87b1e
- Merge branch 'docs/refactor-pipeline-schedules-ee' into 'master' · 1188042d
  Sean Packham (GitLab) authored May 19, 2017
```
Refactor pipeline schedules docs

See merge request !1926
```
  1188042d
- Refactor pipeline schedules docs · 6a340892
  Achilleas Pipinellis authored May 19, 2017
  
  6a340892
- MRWidget: Fix approval footer JS spec. · 237f16da
  Fatih Acet authored May 19, 2017
  
  237f16da