summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-281-3/+3
* Merge branch 'gfm-new-line-fix' into 'master' Fatih Acet2016-12-281-1/+1
|\
| * Fix GFM dropdown not showing at beginning of new linesgfm-new-line-fixPhil Hughes2016-12-281-1/+1
* | 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-281-3/+3
|\ \ \ \
| * | | | Change status colors of runners to better defaults25430-make-colors-in-runner-status-more-colorblind-friendlydimitrieh2016-12-271-3/+3
* | | | | Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master' Sean McGivern2016-12-281-14/+16
|\ \ \ \ \
| * | | | | Replace link to Resolve conflicts with buttons21135-resolve-these-conflicts-link-is-too-subtleSam Rose2016-12-281-14/+16
| | |_|/ / | |/| | |
* | | | | 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-284-0/+12
|\ \ \ \ \ \
| * | | | | | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-233-3/+3
| * | | | | | adds specs for respective behaviourTiago Botelho2016-12-215-17/+16
| * | | | | | Prevent empty pagination when list is not emptyTiago Botelho2016-12-215-4/+17
* | | | | | | Merge branch 'fix-light-hr-in-descriptions' into 'master' Annabel Dunstone Gray2016-12-281-0/+1
|\ \ \ \ \ \ \
| * | | | | | | darkened hr border color in descriptions because of update of bootstrapdimitrieh2016-12-271-0/+1
* | | | | | | | Merge branch '26126-cache-even-when-no-projects' into 'master' Yorick Peterse2016-12-281-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Cache project authorizations even when user has access to zero projects26126-cache-even-when-no-projectsAdam Niedzielski2016-12-281-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-admin-group-page' into 'master' Sean McGivern2016-12-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix: Admin group show page does not workfix-admin-group-pageValery Sizov2016-12-281-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix grammar error in text about mentioned issuesGrzegorz Bizon2016-12-281-1/+1
|/ / / / / /
* | | | | | Merge branch '25364-fix-preview-multi-request' into 'master' Alfredo Sumaran2016-12-271-60/+55
|\ \ \ \ \ \
| * | | | | | move check for preview loading class to top of method25364-fix-preview-multi-requestMike Greiling2016-12-271-2/+7
| * | | | | | remove preview markdown ajax trigger on textarea blurMike Greiling2016-12-271-7/+3
| * | | | | | fix some more eslint rulesMike Greiling2016-12-271-6/+8
| * | | | | | fix some eslint rulesMike Greiling2016-12-271-19/+18
| * | | | | | add loading class to preview element and check it to prevent multiple ajax re...Mike Greiling2016-12-271-3/+3
| * | | | | | rename renderMarkdown to fetchMarkdownPreview to be less misleadingMike Greiling2016-12-271-2/+2
| * | | | | | use $ sign to make it clear when dealing with jQuery objectMike Greiling2016-12-271-9/+9
| * | | | | | refactor _this usage into proper function bindingMike Greiling2016-12-271-15/+11
| * | | | | | remove superfluous return statements generated by coffeescriptMike Greiling2016-12-271-27/+24
* | | | | | | Revert "Merge branch 'increase-left-padding-of-filter-row-labels' into 'master'"Fatih Acet2016-12-271-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '18786-go-to-a-project-order' into 'master' Alfredo Sumaran2016-12-272-2/+3
|\ \ \ \ \ \
| * | | | | | Go to a project orderJacopo2016-12-152-2/+3
* | | | | | | Merge branch '25907-limited-container' into 'master' Fatih Acet2016-12-271-29/+31
|\ \ \ \ \ \ \
| * | | | | | | Only limit container width on issues & MRs within fixed-width container25907-limited-containerAnnabel Dunstone Gray2016-12-271-29/+31
* | | | | | | | Merge branch '25997-label-text-are-not-vertically-aligned' into 'master' Annabel Dunstone Gray2016-12-271-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Changed the label font size from 13px to 12px25997-label-text-are-not-vertically-alignedJose Ivan Vargas2016-12-271-1/+1
* | | | | | | | Merge branch 'issues/8081' into 'master' Annabel Dunstone Gray2016-12-272-18/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | rename theme to match actual colorsBM5k2016-12-062-8/+8
| * | | | | | | rename graphite theme variables for consistencyBM5k2016-12-061-5/+5
| * | | | | | | rename charcoal theme variables for consistencyBM5k2016-12-021-5/+5
* | | | | | | | Merge branch '1659-long-tag-title' into 'master' Annabel Dunstone Gray2016-12-276-41/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | Truncate tag description and fix mobile for inidividual tag1659-long-tag-titleSam Rose2016-12-276-41/+90
* | | | | | | | | Merge branch 'dz-rename-reserved-project-names' into 'master' Dmitriy Zaporozhets2016-12-271-2/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'dz-rename-reserved-project-names'Dmitriy Zaporozhets2016-12-2744-130/+277
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Rename projects with reserved path namesDmitriy Zaporozhets2016-12-241-2/+2