Commits · d469b49f1e447b810e115d44549166f54d0639b6 · nexedi / gitlab-ce

28 Apr, 2017 9 commits
- Merge branch '2280-fix-commit-search' into 'master' · d469b49f
  Sean McGivern authored Apr 28, 2017
```
Fix commit search on some elasticsearch indexes

Closes #2280

See merge request !1745
```
  d469b49f
- Merge branch 'ee-2246-uuid-is-nil-for-new-installation' into 'master' · 448a3747
  Sean McGivern authored Apr 28, 2017
```
Port of 2246-uuid-is-nil-for-new-installation to EE

See merge request !1733
```
  448a3747
- Merge branch 'fix-mr-approval-sentence' into 'master' · ee8e9c9f
  Filipa Lacerda authored Apr 28, 2017
```
Fix MR approvals sentence

Closes #2272

See merge request !1730
```
  ee8e9c9f
- Fix commit search on some elasticsearch indexes · ee7bd7f6
  Nick Thomas authored Apr 27, 2017
  
  ee7bd7f6
- Merge branch 'master' into 'ee-2246-uuid-is-nil-for-new-installation' · 084a87ae
  Sean McGivern authored Apr 28, 2017
```
# Conflicts:
#   db/schema.rb
```
  084a87ae
- Merge branch 'fix-new-issue-mail-when-service-desk-enabled' into 'master' · 6cad4b0b
  Rémy Coutable authored Apr 28, 2017
```
Fix creating issues by email with Service Desk on

Closes gitlab-ce#31434

See merge request !1743
```
  6cad4b0b
- Merge branch 'ee-environments-vue-5' into 'master' · 17a09e91
  Phil Hughes authored Apr 28, 2017
```
Port of environments-vue-5 to EE

See merge request !1722
```
  17a09e91
- Merge branch 'dm-blob-viewers-ee' into 'master' · 0ddb9e74
  Tim Zallmann authored Apr 28, 2017
```
Refactor rich blob viewers and add Source|Rendered switch

See merge request !1720
```
  0ddb9e74
- Wait for AJAX in Copy as GFM spec now that Markdown docs load lazily · 0900568a
  Douwe Maan authored Apr 27, 2017
  
  0900568a
27 Apr, 2017 15 commits
- Add variable to save us a double lookup · 950c3a2f
  Douwe Maan authored Apr 27, 2017
  
  950c3a2f
- Fix typo · 42e39492
  Douwe Maan authored Apr 27, 2017
  
  42e39492
- Address feedback · dfa12231
  Douwe Maan authored Apr 26, 2017
  
  dfa12231
- Explain BlobViewer::Base#render_error · bc2fbd15
  Douwe Maan authored Apr 26, 2017
  
  bc2fbd15
- Explain how viewers are selected from RICH_VIEWERS · 81a77b23
  Douwe Maan authored Apr 26, 2017
  
  81a77b23
- Added specs for JS method to switch views · ad889683
  Phil Hughes authored Apr 26, 2017
  
  ad889683
- Fixed failing JS tests · b0d4afb5
  Phil Hughes authored Apr 26, 2017
  
  b0d4afb5
- Refactor rich blob viewers and add Source|Rendered switch · 47eabfe4
  Douwe Maan authored Apr 25, 2017
  
  47eabfe4
- Merge branch 'ce-to-ee-2017-04-26' into 'master' · 0748960b
  Rémy Coutable authored Apr 27, 2017
```
CE upstream - Wednesday

Closes gitaly#182, gitlab-ce#31276, #1440, and gitlab-ce#22740

See merge request !1725
```
  0748960b
- Merge branch 'master' into ee-environments-vue-5 · 18e4b510
  Filipa Lacerda authored Apr 27, 2017
```
* master:
  Update ldap.md to clarify uid should list the attribute not the value
```
  18e4b510
- Merge branch 'patch-1' into 'master' · c7a3e99a
  Achilleas Pipinellis authored Apr 27, 2017
```
Update ldap.md to clarify uid should list the attribute not the value

See merge request !1734
```
  c7a3e99a
- Fix MR approvals sentence · 6db70ad2
  Sean McGivern authored Apr 26, 2017
```
The backend code handled this correctly, but was no longer used.
```
  6db70ad2
- Fix creating issues by email with Service Desk on · 7e7b25c8
  Sean McGivern authored Apr 27, 2017
  
  7e7b25c8
- Fix Spinach login issues · 7d16efae
  Rémy Coutable authored Apr 27, 2017
```
This was caused by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10320Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7d16efae
- Fix failing specs in spec/helpers/merge_requests_helper_spec.rb · 630742d0
  Nick Thomas authored Apr 27, 2017
  
  630742d0
26 Apr, 2017 16 commits
- Properly fix the RuboCop offense · 6214b80b
  Rémy Coutable authored Apr 27, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  6214b80b
- Update ldap.md to clarify uid should list the attribute not the value · 2d2d9635
  Lee Matos authored Apr 26, 2017
  
  2d2d9635
- Port of 2246-uuid-is-nil-for-new-installation to EE · 0dcd6e98
  Douglas Barbosa Alexandre authored Apr 24, 2017
  
  0dcd6e98
- Fix a failing rubocop spec on master · 3bf08845
  Nick Thomas authored Apr 26, 2017
  
  3bf08845
- Changes after review · 37308484
  Filipa Lacerda authored Apr 26, 2017
  
  37308484
- Moves folder view components into .vue files · 6e6e3676
  Filipa Lacerda authored Apr 24, 2017
  
  6e6e3676
- Update environment_spec.js · 95061b38
  Filipa Lacerda authored Apr 24, 2017
  
  95061b38
- Use vue files for vue components. · e0b9ec8e
  Filipa Lacerda authored Apr 24, 2017
```
Remove from globalnamespace
```
  e0b9ec8e
- Fix memoization and rename #owner to #owner? · a5444564
  Rémy Coutable authored Apr 26, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a5444564
- Fix Rubocop CyclomaticComplexity offense · dc26a76e
  Rémy Coutable authored Apr 26, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  dc26a76e
- Merge branch 'sh-improve-geo-docs' into 'master' · b8988cb6
  Achilleas Pipinellis authored Apr 26, 2017
```
Improve GitLab Geo documentation

See merge request !1714
```
  b8988cb6
- Improve GitLab Geo documentation · e991d3ba
  Stan Hu authored Apr 26, 2017
  
  e991d3ba
- Merge branch 'docs-reorg-landing-page-ee' into 'master' · dc98ba53
  Achilleas Pipinellis authored Apr 26, 2017
```
refactor ee-docs landing page

Closes #2240

See merge request !1702
```
  dc98ba53
- refactor ee-docs landing page · bbec2cf8
  Marcia Ramos authored Apr 26, 2017
  
  bbec2cf8
- Merge branch 'custom-ldap-sync-settings' into 'master' · 961d1fb1
  Achilleas Pipinellis authored Apr 26, 2017
```
Add custom LDAP user and group sync settings

See merge request !1636
```
  961d1fb1
- Merge branch 'ce-to-ee-2017-04-26' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2017-04-26 · 0c1e4c4c
  kushalpandya authored Apr 26, 2017
  
  0c1e4c4c