summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '28609-fix-redirect-to-home-page-url' into 'master' Robert Speicher2017-03-012-31/+27
|\
| * Fix the redirect to custom home page URL and move it to RootController28609-fix-redirect-to-home-page-urlRémy Coutable2017-02-272-31/+27
* | Merge branch 'custom-empty-exception-class-cop' into 'master' Robert Speicher2017-03-0113-15/+14
|\ \
| * | Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-0113-15/+14
* | | Merge branch 'long-file-name-overflow' into 'master' Filipa Lacerda2017-03-013-10/+13
|\ \ \
| * | | Fixed long filename being under action buttonslong-file-name-overflowPhil Hughes2017-03-013-10/+13
| |/ /
* | | Merge branch 'user-calendar-border' into 'master' Annabel Dunstone Gray2017-03-011-0/+1
|\ \ \
| * | | Removed 0 paddinguser-calendar-borderPhil Hughes2017-03-011-1/+2
| * | | Removed top border from contribution calendarPhil Hughes2017-03-011-2/+2
| |/ /
* | | Merge branch 'diff-make-obvious-cant-comment' into 'master' Annabel Dunstone Gray2017-03-017-7/+99
|\ \ \
| * | | Disables interaction with expanded linesdiff-make-obvious-cant-commentPhil Hughes2017-02-287-21/+33
| * | | Visually display that expanded diff lines cant be commented onPhil Hughes2017-02-286-1/+81
* | | | Merge branch 'board-new-issue-template-in-js' into 'master' Filipa Lacerda2017-03-015-90/+107
|\ \ \ \
| * | | | Moved issue boards new issue form templatePhil Hughes2017-03-015-90/+107
* | | | | Merge branch 'refactor/generalize-unique-internal-users' into 'master' Sean McGivern2017-03-011-14/+22
|\ \ \ \ \
| * | | | | use a more namespacey key for the exclusive leaserefactor/generalize-unique-internal-usershttp://jneen.net/2017-02-281-1/+1
| * | | | | generalize the idea of a "unique internal user"http://jneen.net/2017-02-281-14/+22
* | | | | | Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-017-42/+49
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add /award slash commandmhasbini2017-02-287-42/+49
* | | | | | Merge branch '28837-remove-help-duplicate' into 'master' Dmitriy Zaporozhets2017-03-012-3/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove help from right dropdown28837-remove-help-duplicateAnnabel Dunstone Gray2017-02-282-3/+1
| | |/ / / | |/| | |
* | | | | Fix concurrent access on builds/registerKamil Trzcinski2017-03-011-12/+24
* | | | | Merge branch '28808-fix-top-level-constant-referenced' into 'master' Rémy Coutable2017-03-011-1/+7
|\ \ \ \ \
| * | | | | Don't declare constants in Struct28808-fix-top-level-constant-referencedRémy Coutable2017-02-281-1/+7
* | | | | | Merge branch '28818-tech-debt-pipelines-pagination' into 'master' Alfredo Sumaran2017-02-282-19/+14
|\ \ \ \ \ \
| * | | | | | Pagination only changes the page parameter.28818-tech-debt-pipelines-paginationFilipa Lacerda2017-02-282-19/+14
* | | | | | | Merge branch '23602-show-milestone-id-in-a-consistent-way' into 'master' Alfredo Sumaran2017-02-282-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Format milestone header as issues and MRsPedro Moreira da Silva2017-02-242-4/+3
* | | | | | | | Merge branch 'docs/pages' into 'master' Achilleas Pipinellis2017-02-281-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Move all Pages related content to a single locationdocs/pagesAchilleas Pipinellis2017-02-281-1/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '27622-cycle-analytics-loading' into 'master' Alfredo Sumaran2017-02-281-2/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Clone nested objects from default data.27622-cycle-analytics-loadingFilipa Lacerda2017-02-281-2/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '26348-group-members-rearrange' into 'master' Dmitriy Zaporozhets2017-02-284-8/+7
|\ \ \ \ \ \ \
| * | | | | | | Move `Group -> Members` to top-level, fix missing sub-nav for SubgroupsKushal Pandya2017-02-284-8/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '27934-left-align-logo' into 'master' Dmitriy Zaporozhets2017-02-282-24/+13
|\ \ \ \ \ \ \
| * | | | | | | Left align logo; increase max width of title27934-left-align-logoAnnabel Dunstone Gray2017-02-282-24/+13
| |/ / / / / /
* | | | | | | Merge branch '28661-ci-tables-buttons' into 'master' Annabel Dunstone Gray2017-02-287-113/+97
|\ \ \ \ \ \ \
| * | | | | | | Remove hidden-xs classes from last columns in environments and pipelines table.28661-ci-tables-buttonsFilipa Lacerda2017-02-287-113/+97
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'issue-tags-layout' into 'master' Annabel Dunstone Gray2017-02-281-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix 'New Tag' layout on Tags pageRobert Marcano2017-02-131-1/+1
* | | | | | | 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