Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove CHANGELOG item that was added during merge resolutionremove-wip | Rémy Coutable | 2016-03-18 | 1 | -1/+0 |
* | Merge remote-tracking branch 'origin/master' into remove-wip | Rémy Coutable | 2016-03-18 | 827 | -10066/+15881 |
|\ | |||||
| * | Merge branch 'fix/14418' into 'master' | Robert Speicher | 2016-03-18 | 3 | -23/+9 |
| |\ | |||||
| | * | Dedupe labels in labels selector in Dashboard pagesfix/14418 | Rémy Coutable | 2016-03-18 | 3 | -23/+9 |
| |/ | |||||
| * | Merge branch 'no-gc-retry' into 'master' | Robert Speicher | 2016-03-18 | 3 | -3/+13 |
| |\ | |||||
| | * | Fix HousekeepingService testsno-gc-retry | Jacob Vosmaer | 2016-03-18 | 1 | -2/+2 |
| | * | Do not retry "git gc" | Jacob Vosmaer | 2016-03-17 | 2 | -1/+11 |
| * | | Merge branch 'fix/14388' into 'master' | Douwe Maan | 2016-03-18 | 3 | -1/+27 |
| |\ \ | |||||
| | * | | Add a safeguard in MergeRequest#compute_diverged_commits_count | Rémy Coutable | 2016-03-18 | 3 | -2/+27 |
| | * | | Fix an issue when the target branch of a MR had been deleted | Rémy Coutable | 2016-03-18 | 2 | -1/+2 |
| * | | | Merge branch 'refactor-ui-lists' into 'master' | Dmitriy Zaporozhets | 2016-03-18 | 14 | -76/+61 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Refactor colors and lists | Dmitriy Zaporozhets | 2016-03-18 | 14 | -76/+61 |
| * | | | Merge branch 'add_avatar_to_issue_mr_header' into 'master' | Jacob Schatz | 2016-03-18 | 2 | -4/+4 |
| |\ \ \ | |||||
| | * | | | Add avatar to issue and MR pages headeradd_avatar_to_issue_mr_header | Arinde Eniola | 2016-03-18 | 2 | -4/+4 |
| * | | | | Merge branch 'refactor-variables' into 'master' | Dmitriy Zaporozhets | 2016-03-18 | 4 | -33/+64 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Cleanup somce css colors | Dmitriy Zaporozhets | 2016-03-18 | 4 | -20/+25 |
| | * | | | Re-group scss variables | Dmitriy Zaporozhets | 2016-03-18 | 1 | -21/+47 |
| * | | | | Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' | Douwe Maan | 2016-03-18 | 11 | -45/+187 |
| |\ \ \ \ | |||||
| | * | | | | Refactor `Todo#target` | Douglas Barbosa Alexandre | 2016-03-18 | 2 | -12/+18 |
| | * | | | | Rename `Todo#to_reference` to `Todo#target_reference` | Douglas Barbosa Alexandre | 2016-03-18 | 3 | -5/+5 |
| | * | | | | Update CHANGELOGtrigger-todo-for-mentions-on-commits-page | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -0/+1 |
| | * | | | | Use `Note#for_project_snippet?` to skip notes on project snippet | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -1/+1 |
| | * | | | | Use `Commit#short_id` instead of `Commit.truncate_sha` | Douglas Barbosa Alexandre | 2016-03-18 | 2 | -2/+4 |
| | * | | | | Reuse `for_commit?` on conditional validations | Douglas Barbosa Alexandre | 2016-03-18 | 1 | -2/+2 |
| | * | | | | Update schema info comment on todo related files | Douglas Barbosa Alexandre | 2016-03-18 | 3 | -6/+9 |
| | * | | | | Use todo.done without ! in the controller to mark todo as done | Douglas Barbosa Alexandre | 2016-03-18 | 3 | -6/+6 |
| | * | | | | Trigger a todo for mentions on commits page | Douglas Barbosa Alexandre | 2016-03-18 | 6 | -32/+149 |
| | * | | | | Add commit_id to todos | Douglas Barbosa Alexandre | 2016-03-18 | 2 | -0/+8 |
| | * | | | | Change target_id to null on todos | Douglas Barbosa Alexandre | 2016-03-18 | 2 | -1/+6 |
| * | | | | | Merge branch 'filter-label-missing' into 'master' | Robert Speicher | 2016-03-18 | 6 | -9/+9 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Fixes issue with filter label missing on labels & milestones | Phil Hughes | 2016-03-18 | 6 | -9/+9 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'rs-issue-14259' into 'master' | Robert Speicher | 2016-03-18 | 1 | -2/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Prevent a 500 when a repository's root_ref is nilrs-issue-14259 | Robert Speicher | 2016-03-17 | 1 | -2/+4 |
| * | | | | Merge branch 'dashboard-labels' into 'master' | Robert Speicher | 2016-03-18 | 12 | -94/+113 |
| |\ \ \ \ | |||||
| | * | | | | Fixed failing tests | Phil Hughes | 2016-03-18 | 2 | -7/+6 |
| | * | | | | Updated controller with before_action | Phil Hughes | 2016-03-18 | 5 | -10/+8 |
| | * | | | | Fixes issue on dashboard issues | Phil Hughes | 2016-03-18 | 7 | -67/+92 |
| | * | | | | Full labels data in JSON | Phil Hughes | 2016-03-18 | 1 | -1/+1 |
| | * | | | | Fixed issue with labels dropdown getting wrong labels | Phil Hughes | 2016-03-18 | 5 | -20/+17 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix-mr-close-button' into 'master' | Jacob Schatz | 2016-03-18 | 2 | -2/+10 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Added test | Phil Hughes | 2016-03-18 | 1 | -0/+8 |
| | * | | | Fixes issue with close button not working on MRfix-mr-close-button | Phil Hughes | 2016-03-18 | 1 | -2/+2 |
| * | | | | Merge branch 'improved-issue-sidebar' into 'master' | Jacob Schatz | 2016-03-18 | 5 | -89/+145 |
| |\ \ \ \ | |||||
| | * | | | | Removed global JS varimproved-issue-sidebar | Phil Hughes | 2016-03-18 | 2 | -6/+7 |
| | * | | | | Reused some variables | Phil Hughes | 2016-03-18 | 2 | -4/+7 |
| | * | | | | Links to user on collapsed issue sidebar | Phil Hughes | 2016-03-18 | 2 | -1/+5 |
| | * | | | | Fixed issue when user doesnt exist | Phil Hughes | 2016-03-18 | 2 | -11/+2 |
| | * | | | | Fixed tooltip issue for participants | Phil Hughes | 2016-03-18 | 1 | -1/+1 |
| | * | | | | Improved issue sidebar | Phil Hughes | 2016-03-18 | 5 | -88/+145 |
| | |/ / / | |||||
| * | | | | Merge branch 'docs_select_version_to_install' into 'master' | Achilleas Pipinellis | 2016-03-18 | 4 | -0/+36 |
| |\ \ \ \ |