summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-214-46/+55
|\
| * Move diff line to separate partialbackport-ee-premailerDouwe Maan2016-03-192-19/+28
| * Inline mailer CSS using premailer.Douwe Maan2016-03-192-27/+27
* | 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-204-20/+15
|\ \ \
| * | | Move tooltip to the right of the dropdownStan Hu2016-03-201-0/+4
| * | | Fix specs and remove unnecessary console.logStan Hu2016-03-201-1/+0
| * | | 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-192-2/+2
* | | | 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-193-4/+5
|\ \ \ \ \
| * | | | | Fix bug where wrong commit ID was being used in a merge request diff to show ...Stan Hu2016-03-193-4/+5
* | | | | | Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-197-11/+105
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-18416-3909/+6951
| |\ \ \ \ \
| * | | | | | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-186-41/+43
| * | | | | | Merge branch 'master' into remove-wipDouwe Maan2016-02-298-23/+52
| |\ \ \ \ \ \
| * | | | | | | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-264-7/+65
| * | | | | | | Use specialized system notes when MR is (un)marked as WIPDouwe Maan2016-02-263-1/+35
* | | | | | | | 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-1943-248/+379
| |\ \ \ \ \ \ \
| * | | | | | | | attempting to fix omniauth problemJames Lopez2016-02-181-0/+1
* | | | | | | | | 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
View Lorry Controller Status