Commits · b8fba958c1645de57df5d437ace774d7646e85f4 · nexedi / gitlab-ce

19 May, 2017 15 commits
- Fix some conflicts · b8fba958
  Rémy Coutable authored May 19, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b8fba958
- 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
- Set navbar-gitlab z-index to 400 · 9f51ea38
  Luke "Jared" Bennett authored May 19, 2017
  
  9f51ea38
- MRWidget: Fix approvals related specs. · 1c6aa5c7
  Fatih Acet authored May 19, 2017
  
  1c6aa5c7
18 May, 2017 24 commits
- MRWidget: Remove approved from serializer. · dc9474fb
  Fatih Acet authored May 19, 2017
  
  dc9474fb
- Merge branch 'ee-rubocop-empty-example-group' into 'master' · ffaccec7
  Robert Speicher authored May 18, 2017
```
[EE] Enable the RSpec/EmptyExampleGroup cop

See merge request !1930
```
  ffaccec7
- Merge branch 'fix-trailing-space-mr-widget-ee' into 'master' · d353e822
  Clement Ho authored May 18, 2017
```
Refactored the anchor tag to remove the trailing space in the target branch

See merge request !1931
```
  d353e822
- Merge branch 'ee-mk-fix-issue-1843' into 'master' · cf4c37b4
  Douwe Maan authored May 18, 2017
```
Port of mk-fix-issue-1843 to EE

See merge request !1925
```
  cf4c37b4
- Re-add a `end` removed inadvertently · 383b7aba
  Rémy Coutable authored May 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  383b7aba
- Merge branch 'assignee-sidebar-tooltip-overlap' into 'master' · 4402cdd5
  Clement Ho authored May 18, 2017
```
Fixed assignees tooltip clipping in sidebar

Closes gitlab-ce#32512

See merge request !1928
```
  4402cdd5
- Refactored the anchor tag to remove the trailing space in the target branch · fb80bf0d
  Jose Ivan Vargas authored May 18, 2017
  
  fb80bf0d
- Resolve a forgotten conflict · abccc8c7
  Rémy Coutable authored May 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  abccc8c7
- [EE] Enable the RSpec/EmptyExampleGroup cop · bffde12c
  Rémy Coutable authored May 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bffde12c
- Use Namespace.for_user scope (formerly known as Namespace.root) · 46ae8325
  Douwe Maan authored May 18, 2017
  
  46ae8325
- Fix GeoAwareAvatar#avatar_url signature · ad2f0fe9
  Rémy Coutable authored May 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  ad2f0fe9
- Merge branch 'ee-gitaly-local-branches' into 'master' · ae976e93
  Douwe Maan authored May 18, 2017
```
Gitaly local branches

See merge request !1751
```
  ae976e93
- Merge branch 'bvl-update-ldap-user-groups-on-login' into 'master' · dafdb401
  Drew Blessing authored May 18, 2017
```
Add a user's memberships when logging in

Closes #906

See merge request !1819
```
  dafdb401
- Add a user's memberships when logging in · 10f1a1f2
  Bob Van Landuyt authored May 18, 2017
  
  10f1a1f2
- Fixed assignees tooltip clipping in sidebar · b943596e
  Phil Hughes authored May 18, 2017
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/32512
```
  b943596e
- Merge branch 'ce-to-ee-2017-05-17' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2017-05-17 · 2c27ee95
  Valery Sizov authored May 18, 2017
  
  2c27ee95
- Resolve conflicts in CE->EE MR · 182060b4
  Valery Sizov authored May 18, 2017
  
  182060b4
- Resolve more conflicts · 7e245b64
  Rémy Coutable authored May 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7e245b64
- Resolve CSS conflict · d60364f7
  Rémy Coutable authored May 18, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d60364f7
- Fix CE to EE merge conflicts · 206d451e
  kushalpandya authored May 18, 2017
  
  206d451e
- Merge branch 'docs-add-api-to-all-headings-ee' into 'master' · 1552a182
  Sean Packham (GitLab) authored May 18, 2017
```
Add "API" to all API docs

See merge request !1922
```
  1552a182
- Add "API" to all API docs · 09187d88
  Marcia Ramos authored May 18, 2017
  
  09187d88
- Merge branch... · 1cc966a4
  Phil Hughes authored May 18, 2017
```
Merge branch '31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled-ee' into 'master'

Automatically close user dropdown for CE (EE Version)

See merge request !1921
```
  1cc966a4
- Fixes #32474 · e1cc4671
  Michael Kozono authored May 17, 2017
```
Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
```
  e1cc4671
17 May, 2017 1 commit
- Merge branch 'fix-participants-style' into 'master' · 48437540
  Annabel Dunstone Gray authored May 17, 2017
```
Fix participants css

Closes #2423

See merge request !1924
```
  48437540