Commits · c595b41881896e0987d66d9be8b307cfed97fd7d · Boxiang Sun / gitlab-ce

29 Dec, 2016 1 commit
- 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 39 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
- 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
- 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
- Merge branch 'gfm-new-line-fix' into 'master' · 19e3ab18
  Fatih Acet authored Dec 28, 2016
```
Fix GFM dropdown not showing at beginning of new lines

Closes #26145

See merge request !8338
```
  19e3ab18
- Merge branch '26153-refactor-line-length' into 'master' · 99cccf51
  Fatih Acet authored Dec 28, 2016
```
Refactor line length css

Closes #26153

See merge request !8354
```
  99cccf51
- Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master' · 12b6fdb1
  Fatih Acet authored Dec 28, 2016
```
Defer tooltip update on Resolve Comment button after DOM cycle

Closes #25957

See merge request !8335
```
  12b6fdb1
- Refactor line length css · 4052869a
  Annabel Dunstone Gray authored Dec 28, 2016
  
  4052869a
- limit body click selector to tags with a hash target · 49d28849
  Mike Greiling authored Dec 28, 2016
  
  49d28849
- don't take for granted that all anchor tags have an href attribute · 5fe5f33d
  Mike Greiling authored Dec 28, 2016
  
  5fe5f33d
- Merge branch '25430-make-colors-in-runner-status-more-colorblind-friendly' into 'master' · 6f91c3ce
  Annabel Dunstone Gray authored Dec 28, 2016
```
Change status colors of runners to better defaults

Closes #25430

See merge request !8334
```
  6f91c3ce
- Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master' · de87c6f6
  Sean McGivern authored Dec 28, 2016
```
Replace link to Resolve conflicts with buttons

Closes #21135

See merge request !8229
```
  de87c6f6
- Defer tooltip update on Resolve Comment button after DOM cycle · 33251af3
  Sam Rose authored Dec 27, 2016
  
  33251af3
- Merge branch 'fix-non-iife-classes' into 'master' · ac3789d2
  Alfredo Sumaran authored Dec 28, 2016
```
Ensure javascript classes declared outside an IIFE are properties of window

See merge request !8080
```
  ac3789d2
- Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' · f3edd7c8
  Douwe Maan authored Dec 28, 2016
```
adds kaminari_pagination controller concern with bounded pagination to not displ…

Closes #19988

See merge request !8172
```
  f3edd7c8
- add CHANGELOG.md entry for !8046 · 4704a597
  Mike Greiling authored Dec 28, 2016
  
  4704a597
- move body click binding inside the onready callback · 682b71ea
  Mike Greiling authored Dec 28, 2016
  
  682b71ea
- catch instances where hashchange event is not fired yet we still want to adjust scroll position · da44d84d
  Mike Greiling authored Dec 12, 2016
  
  da44d84d
- Merge branch 'fix-light-hr-in-descriptions' into 'master' · f12a8c46
  Annabel Dunstone Gray authored Dec 28, 2016
```
darkened hr border color in descriptions because of update of bootstrap

See merge request !8333
```
  f12a8c46
- allow header buttons to take more than 50% of the screen width · 36d6af43
  Mike Greiling authored Dec 22, 2016
  
  36d6af43
- Merge branch 'clean-api-params' into 'master' · 6892216f
  Sean McGivern authored Dec 28, 2016
```
Parameter already enforced via grape

See merge request !8344
```
  6892216f
- Merge branch 'dz-improve-admin-group-routing' into 'master' · b32176bc
  Sean McGivern authored Dec 28, 2016
```
Fix 500 error when visit group from admin area if group name contains dot

See merge request !8342
```
  b32176bc
- Merge branch '26126-cache-even-when-no-projects' into 'master' · 0d930161
  Yorick Peterse authored Dec 28, 2016
```
Cache project authorizations even when user has access to zero projects

Closes #26126

See merge request !8327
```
  0d930161
- Merge branch 'fix-admin-group-page' into 'master' · ce3cf698
  Sean McGivern authored Dec 28, 2016
```
Fix: Admin group show page does not work

Closes #26147

See merge request !8339
```
  ce3cf698
- Replace link to Resolve conflicts with buttons · 822534c4
  Sam Rose authored Dec 21, 2016
```
Use variables for display logic conditional checks
```
  822534c4
- Merge branch 'ux-guide-color-update' into 'master' · cbee5f00
  Annabel Dunstone Gray authored Dec 28, 2016
```
UX Guide: split state and action guidance for color

See merge request !8204
```
  cbee5f00
- Merge branch 'ux-guide-scroll-animation' into 'master' · 8afe8fb4
  Annabel Dunstone Gray authored Dec 28, 2016
```
UX Guide: add moving transition animation guidance

See merge request !8147
```
  8afe8fb4
- add CHANGELOG.md entry for !8346 · 7510d97f
  Mike Greiling authored Dec 28, 2016
  
  7510d97f
- fix left border in session tabs · a051d326
  Mike Greiling authored Dec 28, 2016
  
  a051d326
- Cache project authorizations even when user has access to zero projects · f0ba0018
  Adam Niedzielski authored Dec 28, 2016
  
  f0ba0018
- Fix: Admin group show page does not work · 68453632
  Valery Sizov authored Dec 28, 2016
  
  68453632
- Merge branch 'up-for-grabs-process' into 'master' · 0499431a
  Sean McGivern authored Dec 28, 2016
```
Remove "up-for-grabs" label from PROCESS.md

See merge request !8341
```
  0499431a
- Merge branch 'mrchrisw-set-SIDEKIQ_LOG_ARGUMENTS' into 'master' · d1debe18
  Sean McGivern authored Dec 28, 2016
```
Set SIDEKIQ_LOG_ARGUMENTS in gitlab.rb

See merge request !8340
```
  d1debe18
- Merge branch 'fix/mentioned-issue-text-grammar' into 'master' · 0dcbd4c7
  Sean McGivern authored Dec 28, 2016
```
Fix grammar error in text about mentioned issues

See merge request !8337
```
  0dcbd4c7
- Fix 500 error when visit group from admin area if group name contains dot · 7f1d9548
  Dmitriy Zaporozhets authored Dec 28, 2016
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7f1d9548
- Parameter already enforced via grape · 2ac92662
  Robert Schilling authored Dec 28, 2016
  
  2ac92662