summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed bug where participants would not work correctly on merge requestsmerge-request-sidebarPhil Hughes2016-03-214-31/+30
* Merge branch 'upgrade-rubocop' into 'master' Robert Speicher2016-03-213-481/+499
|\
| * Update Rubocop from 0.35.1 to 0.38.0.connorshea2016-03-203-481/+499
|/
* Merge branch 'css-zero-unit-again' into 'master' Jacob Schatz2016-03-203-3/+3
|\
| * Fix a few remaining uses of `0px`.connorshea2016-03-183-3/+3
* | Merge branch 'fix-default-http-clone' into 'master' Jacob Schatz2016-03-207-22/+37
|\ \
| * | Move tooltip to the right of the dropdownStan Hu2016-03-201-0/+4
| * | Fix specs and remove unnecessary console.logStan Hu2016-03-202-3/+2
| * | Use http_clone_button and ssh_clone_button to restore tooltip functionality i...Stan Hu2016-03-192-20/+12
| * | Make HTTP(s) label consistent on clone barStan Hu2016-03-194-2/+22
* | | Merge branch 'edit-form-alignment' into 'master' Jacob Schatz2016-03-204-8/+16
|\ \ \
| * | | Fix spacing below edit note formedit-form-alignmentPhil Hughes2016-03-184-8/+16
* | | | Merge branch 'rs-auto-expand-sidebar' into 'master' Jacob Schatz2016-03-201-3/+22
|\ \ \ \
| * | | | Expand the issuable sidebar when coming back from the Changes tabrs-auto-expand-sidebarRobert Speicher2016-03-171-3/+22
* | | | | Merge branch 'dropdown-persits-filtered-data' into 'master' Jacob Schatz2016-03-201-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed issue with filtered data persisting when dropdown closeddropdown-persits-filtered-dataPhil Hughes2016-03-181-1/+5
| | |/ / | |/| |
* | | | Merge branch 'fix-image-diff' into 'master' Douwe Maan2016-03-194-4/+6
|\ \ \ \
| * | | | Fix bug where wrong commit ID was being used in a merge request diff to show ...Stan Hu2016-03-194-4/+6
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ \