summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' Dmitriy Zaporozhets2017-02-281-2/+9
|\
| * Don't allow a project to be shared with an ancestor of the group it is inDouwe Maan2017-02-281-2/+9
* | Merge branch '27354-navigation-new-button' into 'master' Dmitriy Zaporozhets2017-02-281-0/+4
|\ \
| * | Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-221-0/+4
* | | Merge branch 'dm-nested-group-shared-projects' into 'master' Dmitriy Zaporozhets2017-02-282-3/+15
|\ \ \
| * | | Fix access to projects shared with a nested groupdm-nested-group-shared-projectsDouwe Maan2017-02-282-3/+15
| | |/ | |/|
* | | Use exceptions for MergeService error handling28769-raise-custom-exception-in-all-methods-of-mergeservice-that-want-to-inform-the-userSean McGivern2017-02-281-11/+9
|/ /
* | Merge branch 'only-create-unmergeable-todo-once' into 'master' Kamil Trzciński2017-02-282-5/+5
|\ \
| * | Only create unmergeable todos onceonly-create-unmergeable-todo-onceSean McGivern2017-02-242-5/+5
* | | Fix CSS classesAlex Sanford2017-02-272-3/+13
* | | Merge branch '28723-consistent-handling-indexof' into 'master' Clement Ho2017-02-276-9/+9
|\ \ \
| * | | Keep consistent in handling indexOf resultsTakuya Noguchi2017-02-256-9/+9
* | | | Merge branch '28212-avoid-dos-on-build-trace' into 'master' Clement Ho2017-02-271-13/+20
|\ \ \ \
| * | | | Replace setInterval with setTimeout to prevent highly frequent requestsTakuya Noguchi2017-02-251-13/+20
| |/ / /
* | | | Merge branch '27840-improve-search-bar-experience' into 'master' Annabel Dunstone Gray2017-02-273-3/+51
|\ \ \ \
| * | | | Fix #27840 - Improve the search bar experience on mobilePratik Borsadiya2017-02-243-3/+51
* | | | | Merge branch 'remove-jquery-ui-draggable' into 'master' Jacob Schatz2017-02-272-25/+58
|\ \ \ \ \
| * | | | | Removed jQuery UI draggableremove-jquery-ui-draggablePhil Hughes2017-02-272-25/+58
* | | | | | Merge branch 'rs-uploaders' into 'master' Douwe Maan2017-02-276-23/+26
|\ \ \ \ \ \
| * | | | | | Minor refactoring of UploadersRobert Speicher2017-02-246-23/+26
* | | | | | | Merge branch '28753-align-buttons-environments' into 'master' Annabel Dunstone Gray2017-02-272-26/+28
|\ \ \ \ \ \ \
| * | | | | | | Align last column buttons with new environment button28753-align-buttons-environmentsFilipa Lacerda2017-02-272-26/+28
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ssh-key-paste' into 'master' Filipa Lacerda2017-02-271-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Updates SSH key title after pasting keyPhil Hughes2017-02-271-3/+4
* | | | | | | | Merge branch 'mock-ci-service' into 'master'Douwe Maan2017-02-273-1/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-243-1/+87
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'rss-btn-alignment-fix' into 'master' Annabel Dunstone Gray2017-02-275-12/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed alignment of RSS button on activity pagesrss-btn-alignment-fixPhil Hughes2017-02-235-12/+4
* | | | | | | | | Merge branch 'mr-diff-comment-button' into 'master' Annabel Dunstone Gray2017-02-278-68/+125
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed link transitionmr-diff-comment-buttonPhil Hughes2017-02-276-5/+14
| * | | | | | | | | Changed dark hover backgroundPhil Hughes2017-02-271-1/+1
| * | | | | | | | | Moved color values into variablesPhil Hughes2017-02-275-15/+20
| * | | | | | | | | Grow the button on hoverPhil Hughes2017-02-272-15/+15
| * | | | | | | | | Improved the diff comment button UXPhil Hughes2017-02-278-59/+102
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ci-tables-ui-improvements' into 'master' Annabel Dunstone Gray2017-02-274-267/+114
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-27158-1274/+1715
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Guarantees we show at least 4 stages in line in smaller screensFilipa Lacerda2017-02-231-0/+1
| * | | | | | | | | | Aligns text content instead of divFilipa Lacerda2017-02-232-106/+82
| * | | | | | | | | | Merge branch 'master' into ci-tables-ui-improvementsFilipa Lacerda2017-02-2354-553/+668
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Guarantees buttons will always stay in the same lineFilipa Lacerda2017-02-231-1/+2
| * | | | | | | | | | | Fix btn group not having round corners when there's only some buttons presentFilipa Lacerda2017-02-231-19/+10
| * | | | | | | | | | | Equal padding between table cellsFilipa Lacerda2017-02-222-51/+22
| * | | | | | | | | | | Fix scss linter errorFilipa Lacerda2017-02-221-2/+2
| * | | | | | | | | | | Improvements in spacingFilipa Lacerda2017-02-221-4/+7
| * | | | | | | | | | | Remove unused fileFilipa Lacerda2017-02-221-92/+0
| * | | | | | | | | | | Remove unused css, align buttons with top buttonFilipa Lacerda2017-02-221-21/+15
| * | | | | | | | | | | Convert button into a btn group according to mockupsFilipa Lacerda2017-02-221-29/+32
* | | | | | | | | | | | Merge branch '14748-runner-version-in-admin-views' into 'master' Rémy Coutable2017-02-272-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add runner version to /admin/runners viewJonathon Reinhart2017-02-262-0/+3
* | | | | | | | | | | | | Merge branch 'sh-async-delete-children' into 'master' Dmitriy Zaporozhets2017-02-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \