Commits · 474e170dc98e5045ebd58ad1193211de4cf21b29 · nexedi / gitlab-ce

03 Jan, 2017 1 commit
- Resolve conflicts introduced by: · 474e170d
  Lin Jen-Shin authored Jan 03, 2017
```
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383
```
  474e170d
29 Dec, 2016 30 commits
- Fix conflicts on spec/features/protected_branches_spec.rb · 52976bbf
  Alfredo Sumaran authored Dec 29, 2016
  
  52976bbf
- CE->EE Resolve conflicts · dcd092d5
  Valery Sizov authored Dec 29, 2016
  
  dcd092d5
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream · 93f074d0
  Valery Sizov authored Dec 29, 2016
  
  93f074d0
- Merge branch 'grapify-settings-api' into 'master' · d003966d
  Sean McGivern authored Dec 29, 2016
```
Grapify the settings API

See merge request !1010
```
  d003966d
- Merge branch 'grapify-settings-api' into 'master' · 714f70a3
  Sean McGivern authored Dec 29, 2016
```
Grapify the settings API

See merge request !8336
```
  714f70a3
- Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master' · f7d68dfc
  Annabel Dunstone Gray authored Dec 29, 2016
```
Set default sort for tags to Last updated and fix nav controls spacing

Closes #25925

See merge request !8263
```
  f7d68dfc
- Merge branch 'ce_upstream' into 'master' · 8ab250ab
  Valery Sizov authored Dec 29, 2016
```
CE upstream

Closes #1451 and gitlab-ce#25827

See merge request !1000
```
  8ab250ab
- Merge branch 'grapify-push-rules' into 'master' · 7e115252
  Sean McGivern authored Dec 29, 2016
```
Grapify the push rules API

See merge request !1005
```
  7e115252
- Merge branch 'grapify-project-git-hooks' into 'master' · daced567
  Sean McGivern authored Dec 29, 2016
```
Grapify the project git hooks API

See merge request !1006
```
  daced567
- Merge branch '26134-ctrl-enter-does-not-submit-a-new-merge-request' into 'master' · b0765d24
  Sean McGivern authored Dec 29, 2016
```
CTRL+Enter does not submit a new merge request

Closes #26134

See merge request !8360
```
  b0765d24
- Merge branch 'grapify-ldap-api' into 'master' · 5a4ea5ee
  Sean McGivern authored Dec 29, 2016
```
Grapify the LDAP API

See merge request !1003
```
  5a4ea5ee
- Merge branch 'grapify-ldap-group-links-api' into 'master' · 09d78a38
  Sean McGivern authored Dec 29, 2016
```
Grapify the LDAP group link API

See merge request !1002
```
  09d78a38
- Merge branch 'issue_25889' into 'master' · 58d986f9
  Sean McGivern authored Dec 29, 2016
```
Revert MattermostNotificationService and SlackNotificationService to MattermostS…

Closes #25889

See merge request !8240
```
  58d986f9
- CTRL+Enter does not submit a new merge request · e74b8bd1
  Saad Shahd authored Dec 29, 2016
  
  e74b8bd1
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 80b54eeb
  Valery Sizov authored Dec 29, 2016
  
  80b54eeb
- Merge branch 'dz-fix-milestones-spec' into 'master' · f1a1058c
  Dmitriy Zaporozhets authored Dec 29, 2016
```
Fix RoutingError at ./spec/features/milestones/milestones_spec.rb

See merge request !8361
```
  f1a1058c
- Merge branch 'view-ce-vs-ee' into 'master' · 0a6e660b
  Sean McGivern authored Dec 29, 2016
```
About GitLab link in sidebar that links to help page

Closes gitlab-ce#24479

See merge request !1008
```
  0a6e660b
- Merge branch 'view-ce-vs-ee' into 'master' · 27db8f72
  Sean McGivern authored Dec 29, 2016
```
About GitLab link in sidebar that links to help page

Closes #24479

See merge request !8316
```
  27db8f72
- Grapify the LDAP group link API · 16a8b5c6
  Robert Schilling authored Dec 28, 2016
  
  16a8b5c6
- Grapify the LDAP API · 78863f87
  Robert Schilling authored Dec 28, 2016
  
  78863f87
- Grapify the push rules API · 497af21c
  Robert Schilling authored Dec 28, 2016
  
  497af21c
- Grapify the project git hooks API · 65e1a06e
  Robert Schilling authored Dec 28, 2016
  
  65e1a06e
- Merge branch 'grapify-license-api' into 'master' · 01335c14
  Sean McGivern authored Dec 29, 2016
```
Grapify the license API

See merge request !1004
```
  01335c14
- Grapify the settings API · ec7485de
  Robert Schilling authored Dec 13, 2016
  
  ec7485de
- Grapify the settings API · 30df5093
  Robert Schilling authored Dec 29, 2016
  
  30df5093
- Merge branch 'issue_22664-ee' into 'master' · 4901e5c2
  Sean McGivern authored Dec 29, 2016
```
Check if user can read project before being assigned to issue

See merge request !1007
```
  4901e5c2
- Merge branch 'issue_22664' into 'master' · 91bbcff5
  Sean McGivern authored Dec 29, 2016
```
Check if user can read project before being assigned to issue

Closes #22664

See merge request !7980
```
  91bbcff5
- Wait for ajax request to complete when testing milestont drang-n-drop feature · f7d6fbf6
  Dmitriy Zaporozhets authored Dec 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f7d6fbf6
- Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' · ce6de946
  Sean McGivern authored Dec 29, 2016
```
Fix unclear closing issue behaviour on Merge Request show page

Closes #26152

See merge request !8345
```
  ce6de946
- Merge branch 'dz-nested-group-access' into 'master' · c595b418
  Dmitriy Zaporozhets authored Dec 29, 2016
```
Inherit permissions from parent group

See merge request !8071
```
  c595b418
28 Dec, 2016 9 commits
- Merge branch '24941-login-tabs-border' into 'master' · 7d0e63fa
  Alfredo Sumaran authored Dec 28, 2016
```
fix left border in session tabs

Closes #24941

See merge request !8346
```
  7d0e63fa
- About GitLab link in sidebar that links to help page · 450036f5
  victorwu authored Dec 28, 2016
  
  450036f5
- Improve Group#users_with_parents method · 9f39953e
  Dmitriy Zaporozhets authored Dec 29, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9f39953e
- Merge branch... · 104b7b6c
  Alfredo Sumaran authored Dec 28, 2016
```
Merge branch '24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-other-depending-on-the-selected-filter' into 'master'

Resolve "Buttons in the "Branches" page are stacking on top of each other depending on the selected filter"

Closes #24820

See merge request !8074
```
  104b7b6c
- Merge branch '24876-page-jumps-to-wrong-position-when-clicking-a-comment-anchor' into 'master' · 170b712f
  Alfredo Sumaran authored Dec 28, 2016
```
Fix instances where clicking a comment anchor twice will scroll to the wrong position

Closes #24876

See merge request !8046
```
  170b712f
- About GitLab link in sidebar that links to help page · 4815314b
  victorwu authored Dec 27, 2016
  
  4815314b
- change chevron position for branch sort order dropdown menu · b69dec2a
  Mike Greiling authored Dec 28, 2016
  
  b69dec2a
- add CHANGELOG.md entry for !8074 · 5a91daec
  Mike Greiling authored Dec 22, 2016
  
  5a91daec
- fix mobile view for branch index header · ba2bbd4b
  Mike Greiling authored Dec 22, 2016
  
  ba2bbd4b