summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove CHANGELOG item that was added during merge resolutionremove-wipRémy Coutable2016-03-181-1/+0
* Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-18827-10066/+15881
|\
| * Merge branch 'fix/14418' into 'master' Robert Speicher2016-03-183-23/+9
| |\
| | * 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-183-3/+13
| |\
| | * Fix HousekeepingService testsno-gc-retryJacob Vosmaer2016-03-181-2/+2
| | * Do not retry "git gc"Jacob Vosmaer2016-03-172-1/+11
| * | Merge branch 'fix/14388' into 'master' Douwe Maan2016-03-183-1/+27
| |\ \
| | * | Add a safeguard in MergeRequest#compute_diverged_commits_countRémy Coutable2016-03-183-2/+27
| | * | Fix an issue when the target branch of a MR had been deletedRémy Coutable2016-03-182-1/+2
| * | | 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-1811-45/+187
| |\ \ \ \
| | * | | | Refactor `Todo#target`Douglas Barbosa Alexandre2016-03-182-12/+18
| | * | | | Rename `Todo#to_reference` to `Todo#target_reference`Douglas Barbosa Alexandre2016-03-183-5/+5
| | * | | | Update CHANGELOGtrigger-todo-for-mentions-on-commits-pageDouglas Barbosa Alexandre2016-03-181-0/+1
| | * | | | 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-182-2/+4
| | * | | | Reuse `for_commit?` on conditional validationsDouglas Barbosa Alexandre2016-03-181-2/+2
| | * | | | Update schema info comment on todo related filesDouglas Barbosa Alexandre2016-03-183-6/+9
| | * | | | Use todo.done without ! in the controller to mark todo as doneDouglas Barbosa Alexandre2016-03-183-6/+6
| | * | | | Trigger a todo for mentions on commits pageDouglas Barbosa Alexandre2016-03-186-32/+149
| | * | | | Add commit_id to todosDouglas Barbosa Alexandre2016-03-182-0/+8
| | * | | | Change target_id to null on todosDouglas Barbosa Alexandre2016-03-182-1/+6
| * | | | | 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
| * | | | Merge branch 'dashboard-labels' into 'master' Robert Speicher2016-03-1812-94/+113
| |\ \ \ \
| | * | | | 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-187-67/+92
| | * | | | 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-182-2/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Added testPhil Hughes2016-03-181-0/+8
| | * | | 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 'docs_select_version_to_install' into 'master' Achilleas Pipinellis2016-03-184-0/+36
| |\ \ \ \