summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename logo, apply for Slack toouse-stable-icon-urlZ.J. van de Weg2016-12-293-2/+2
* Add logo in public filesZ.J. van de Weg2016-12-292-1/+1
* Use stable icon for Mattermost integrationKamil Trzcinski2016-12-291-1/+1
* Merge branch 'mentioned-but-not-closed-issues-messages' into 'master' Sean McGivern2016-12-293-8/+12
|\
| * add changelog entryGabriel Gizotti2016-12-291-0/+4
| * use MergeRequest#closes_issues instead of rewriting code to retrieve closing ...Gabriel Gizotti2016-12-282-8/+8
* | Merge branch 'dz-nested-group-access' into 'master' Dmitriy Zaporozhets2016-12-295-6/+93
|\ \
| * | Improve Group#users_with_parents methoddz-nested-group-accessDmitriy Zaporozhets2016-12-291-1/+1
| * | Include group parents into read access for project and groupDmitriy Zaporozhets2016-12-265-6/+93
* | | Merge branch '24941-login-tabs-border' into 'master' Alfredo Sumaran2016-12-282-2/+6
|\ \ \
| * | | add CHANGELOG.md entry for !834624941-login-tabs-borderMike Greiling2016-12-281-0/+4
| * | | fix left border in session tabsMike Greiling2016-12-281-2/+2
* | | | Merge branch '24820-buttons-in-the-branches-page-are-stacking-on-top-of-each-...Alfredo Sumaran2016-12-283-2/+10
|\ \ \ \
| * | | | change chevron position for branch sort order dropdown menuMike Greiling2016-12-281-1/+1
| * | | | add CHANGELOG.md entry for !8074Mike Greiling2016-12-281-0/+4
| * | | | fix mobile view for branch index headerMike Greiling2016-12-281-0/+4
| * | | | allow header buttons to take more than 50% of the screen widthMike Greiling2016-12-281-1/+1
* | | | | Merge branch '24876-page-jumps-to-wrong-position-when-clicking-a-comment-anch...Alfredo Sumaran2016-12-282-0/+12
|\ \ \ \ \
| * | | | | limit body click selector to tags with a hash target24876-page-jumps-to-wrong-position-when-clicking-a-comment-anchorMike Greiling2016-12-281-2/+2
| * | | | | don't take for granted that all anchor tags have an href attributeMike Greiling2016-12-281-1/+1
| * | | | | add CHANGELOG.md entry for !8046Mike Greiling2016-12-281-0/+4
| * | | | | move body click binding inside the onready callbackMike Greiling2016-12-281-8/+8
| * | | | | catch instances where hashchange event is not fired yet we still want to adju...Mike Greiling2016-12-281-0/+8
| |/ / / /
* | | | | Merge branch 'gfm-new-line-fix' into 'master' Fatih Acet2016-12-283-1/+17
|\ \ \ \ \
| * | | | | Fix GFM dropdown not showing at beginning of new linesgfm-new-line-fixPhil Hughes2016-12-283-1/+17
* | | | | | Merge branch '26153-refactor-line-length' into 'master' Fatih Acet2016-12-282-49/+4
|\ \ \ \ \ \
| * | | | | | Refactor line length cssAnnabel Dunstone Gray2016-12-282-49/+4
* | | | | | | Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tool...Fatih Acet2016-12-281-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Defer tooltip update on Resolve Comment button after DOM cycleSam Rose2016-12-281-4/+6
* | | | | | | | Merge branch '25430-make-colors-in-runner-status-more-colorblind-friendly' in...Annabel Dunstone Gray2016-12-282-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Change status colors of runners to better defaults25430-make-colors-in-runner-status-more-colorblind-friendlydimitrieh2016-12-272-3/+7
* | | | | | | | | Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master' Sean McGivern2016-12-282-14/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace link to Resolve conflicts with buttons21135-resolve-these-conflicts-link-is-too-subtleSam Rose2016-12-282-14/+20
* | | | | | | | | | Merge branch 'fix-non-iife-classes' into 'master' Alfredo Sumaran2016-12-2810-1/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ensure classes declared outside an IIFE are properties of windowfix-non-iife-classesMike Greiling2016-12-1410-1/+21
* | | | | | | | | | | Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' Douwe Maan2016-12-289-2/+125
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-237-11/+13
| * | | | | | | | | | | adds specs for respective behaviourTiago Botelho2016-12-219-19/+123
| * | | | | | | | | | | Prevent empty pagination when list is not emptyTiago Botelho2016-12-216-4/+21
* | | | | | | | | | | | Merge branch 'fix-light-hr-in-descriptions' into 'master' Annabel Dunstone Gray2016-12-282-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | changelog entryfix-light-hr-in-descriptionsdimitrieh2016-12-271-0/+4
| * | | | | | | | | | | darkened hr border color in descriptions because of update of bootstrapdimitrieh2016-12-271-0/+1
* | | | | | | | | | | | Merge branch 'clean-api-params' into 'master' Sean McGivern2016-12-281-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Parameter already enforced via grapeclean-api-paramsRobert Schilling2016-12-281-2/+0
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'dz-improve-admin-group-routing' into 'master' Sean McGivern2016-12-283-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routingDmitriy Zaporozhets2016-12-283-3/+13
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch '26126-cache-even-when-no-projects' into 'master' Yorick Peterse2016-12-283-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Cache project authorizations even when user has access to zero projects26126-cache-even-when-no-projectsAdam Niedzielski2016-12-283-7/+36
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-admin-group-page' into 'master' Sean McGivern2016-12-282-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-282-1/+11
| | |/ / / / / / / / / | |/| | | | | | | | |