summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'label-tooltip' into 'master' Douwe Maan2016-03-194-10/+11
|\
| * Add label description in tooltip to labels in issue index and sidebarDouwe Maan2016-03-164-10/+11
* | Merge branch 'issue-branch-iid-postfix' into 'master' Douwe Maan2016-03-193-6/+5
|\ \
| * | \#to_branch_name now uses the iid as postfixissue-branch-iid-postfixZeger-Jan van de Weg2016-03-183-6/+5
* | | Dedupe labels in labels selector in Dashboard pagesfix/14418Rémy Coutable2016-03-183-23/+9
* | | Merge branch 'no-gc-retry' into 'master' Robert Speicher2016-03-182-1/+11
|\ \ \
| * | | Do not retry "git gc"Jacob Vosmaer2016-03-172-1/+11
* | | | Merge branch 'fix/14388' into 'master' Douwe Maan2016-03-181-1/+4
|\ \ \ \
| * | | | Add a safeguard in MergeRequest#compute_diverged_commits_countRémy Coutable2016-03-182-2/+5
| * | | | Fix an issue when the target branch of a MR had been deletedRémy Coutable2016-03-181-1/+1
| | |/ / | |/| |
* | | | Merge branch 'refactor-ui-lists' into 'master' Dmitriy Zaporozhets2016-03-1814-76/+61
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor colors and listsDmitriy Zaporozhets2016-03-1814-76/+61
* | | | Merge branch 'add_avatar_to_issue_mr_header' into 'master' Jacob Schatz2016-03-182-4/+4
|\ \ \ \
| * | | | Add avatar to issue and MR pages headeradd_avatar_to_issue_mr_headerArinde Eniola2016-03-182-4/+4
* | | | | Merge branch 'refactor-variables' into 'master' Dmitriy Zaporozhets2016-03-184-33/+64
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Cleanup somce css colorsDmitriy Zaporozhets2016-03-184-20/+25
| * | | | Re-group scss variablesDmitriy Zaporozhets2016-03-181-21/+47
* | | | | Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' Douwe Maan2016-03-184-34/+78
|\ \ \ \ \
| * | | | | Refactor `Todo#target`Douglas Barbosa Alexandre2016-03-181-5/+1
| * | | | | Rename `Todo#to_reference` to `Todo#target_reference`Douglas Barbosa Alexandre2016-03-182-2/+2
| * | | | | Use `Note#for_project_snippet?` to skip notes on project snippetDouglas Barbosa Alexandre2016-03-181-1/+1
| * | | | | Use `Commit#short_id` instead of `Commit.truncate_sha`Douglas Barbosa Alexandre2016-03-181-1/+1
| * | | | | Reuse `for_commit?` on conditional validationsDouglas Barbosa Alexandre2016-03-181-2/+2
| * | | | | Update schema info comment on todo related filesDouglas Barbosa Alexandre2016-03-181-2/+3
| * | | | | Use todo.done without ! in the controller to mark todo as doneDouglas Barbosa Alexandre2016-03-182-3/+3
| * | | | | Trigger a todo for mentions on commits pageDouglas Barbosa Alexandre2016-03-183-29/+76
* | | | | | Merge branch 'filter-label-missing' into 'master' Robert Speicher2016-03-186-9/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixes issue with filter label missing on labels & milestonesPhil Hughes2016-03-186-9/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-issue-14259' into 'master' Robert Speicher2016-03-181-2/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Prevent a 500 when a repository's root_ref is nilrs-issue-14259Robert Speicher2016-03-171-2/+4
* | | | | Fixed failing testsPhil Hughes2016-03-182-7/+6
* | | | | Updated controller with before_actionPhil Hughes2016-03-185-10/+8
* | | | | Fixes issue on dashboard issuesPhil Hughes2016-03-186-67/+90
* | | | | Full labels data in JSONPhil Hughes2016-03-181-1/+1
* | | | | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-185-20/+17
* | | | | Merge branch 'fix-mr-close-button' into 'master' Jacob Schatz2016-03-181-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixes issue with close button not working on MRfix-mr-close-buttonPhil Hughes2016-03-181-2/+2
* | | | | Merge branch 'improved-issue-sidebar' into 'master' Jacob Schatz2016-03-185-89/+145
|\ \ \ \ \
| * | | | | Removed global JS varimproved-issue-sidebarPhil Hughes2016-03-182-6/+7
| * | | | | Reused some variablesPhil Hughes2016-03-182-4/+7
| * | | | | Links to user on collapsed issue sidebarPhil Hughes2016-03-182-1/+5
| * | | | | Fixed issue when user doesnt existPhil Hughes2016-03-182-11/+2
| * | | | | Fixed tooltip issue for participantsPhil Hughes2016-03-181-1/+1
| * | | | | Improved issue sidebarPhil Hughes2016-03-185-88/+145
| |/ / / /
* | | | | Merge branch 'fix-mr-source-sha' into 'master' Douwe Maan2016-03-181-1/+5
|\ \ \ \ \
| * | | | | Fix MergeRequest#source_sha when there is no diffPierre de La Morinerie2016-03-161-1/+5
* | | | | | Merge branch 'issue-fade-load' into 'master' Jacob Schatz2016-03-185-62/+113
|\ \ \ \ \ \
| * | | | | | Another CS style fixissue-fade-loadPhil Hughes2016-03-181-1/+1
| * | | | | | Fixed some CS styling issuesPhil Hughes2016-03-184-74/+85
| * | | | | | Fixed issue with dashboard issues not reloadingPhil Hughes2016-03-183-4/+17