summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix typos and denting2489-soft-delete-issuesZeger-Jan van de Weg2016-03-214-11/+11
* Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-2117-165/+110
* Satisfy rubocopZeger-Jan van de Weg2016-03-192-4/+1
* minor improvements and fixed specsZeger-Jan van de Weg2016-03-196-29/+34
* Dry destroy action on issuablesZeger-Jan van de Weg2016-03-1915-43/+56
* Hide delete botton on edit pageZeger-Jan van de Weg2016-03-196-11/+9
* Soft delete issuablesZeger-Jan van de Weg2016-03-1920-18/+254
* Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-1910-29/+118
|\
| * 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
| |\
| * | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-187-59/+53
| * | Merge branch 'master' into remove-wipDouwe Maan2016-02-2914-41/+181
| |\ \
| * | | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-266-7/+67
| * | | Use specialized system notes when MR is (un)marked as WIPDouwe Maan2016-02-264-1/+36
* | | | Merge branch 'fix/gitlab-omniauth-issue' into 'master' Douwe Maan2016-03-191-0/+1
|\ \ \ \
| * | | | another attempt to fix oauth issueJames Lopez2016-02-191-1/+1
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/gitlab-omni...James Lopez2016-02-1998-490/+1492
| |\ \ \ \
| * | | | | attempting to fix omniauth problemJames Lopez2016-02-181-0/+1
* | | | | | Merge branch 'label-tooltip' into 'master' Douwe Maan2016-03-197-13/+23
|\ \ \ \ \ \
| * | | | | | Fix specslabel-tooltipRémy Coutable2016-03-182-3/+11
| * | | | | | Add label description in tooltip to labels in issue index and sidebarDouwe Maan2016-03-165-10/+12
* | | | | | | Merge branch 'issue-branch-iid-postfix' into 'master' Douwe Maan2016-03-194-9/+8
|\ \ \ \ \ \ \
| * | | | | | | \#to_branch_name now uses the iid as postfixissue-branch-iid-postfixZeger-Jan van de Weg2016-03-184-9/+8
* | | | | | | | Merge branch 'master' into 'master' Achilleas Pipinellis2016-03-191-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | fixed md anchor linkPat Turner2016-03-181-2/+2
| * | | | | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366Pat Turner2016-03-181-2/+2
| * | | | | | | removed anchor as unsupported in markdownPat Turner2016-03-171-2/+2
| * | | | | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366Pat Turner2016-03-171-0/+2
* | | | | | | | 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
View Lorry Controller Status