Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'remove-wip' into 'master' | Jacob Schatz | 2016-03-19 | 2 | -8/+23 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into remove-wip | Rémy Coutable | 2016-03-18 | 186 | -1915/+2269 |
| |\ | |||||
| * | | Improve the "easy WIP & un-WIP from link" feature | Rémy Coutable | 2016-03-18 | 2 | -14/+19 |
| * | | Easily (un)mark merge request as WIP using link | Douwe Maan | 2016-02-26 | 2 | -5/+15 |
* | | | Merge branch 'label-tooltip' into 'master' | Douwe Maan | 2016-03-19 | 3 | -3/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add label description in tooltip to labels in issue index and sidebar | Douwe Maan | 2016-03-16 | 3 | -3/+3 |
* | | | Merge branch 'refactor-ui-lists' into 'master' | Dmitriy Zaporozhets | 2016-03-18 | 7 | -32/+35 |
|\ \ \ | |||||
| * | | | Refactor colors and lists | Dmitriy Zaporozhets | 2016-03-18 | 7 | -32/+35 |
* | | | | 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 'filter-label-missing' into 'master' | Robert Speicher | 2016-03-18 | 3 | -6/+6 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixes issue with filter label missing on labels & milestones | Phil Hughes | 2016-03-18 | 3 | -6/+6 |
| |/ / / | |||||
* | | | | 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 |
* | | | | Updated controller with before_action | Phil Hughes | 2016-03-18 | 2 | -2/+2 |
* | | | | Fixes issue on dashboard issues | Phil Hughes | 2016-03-18 | 3 | -57/+57 |
* | | | | Fixed issue with labels dropdown getting wrong labels | Phil Hughes | 2016-03-18 | 1 | -2/+2 |
* | | | | Merge branch 'improved-issue-sidebar' into 'master' | Jacob Schatz | 2016-03-18 | 2 | -31/+33 |
|\ \ \ \ | |||||
| * | | | | Removed global JS varimproved-issue-sidebar | Phil Hughes | 2016-03-18 | 1 | -2/+2 |
| * | | | | Reused some variables | Phil Hughes | 2016-03-18 | 1 | -2/+5 |
| * | | | | Links to user on collapsed issue sidebar | Phil Hughes | 2016-03-18 | 1 | -1/+1 |
| * | | | | Fixed issue when user doesnt exist | Phil Hughes | 2016-03-18 | 1 | -1/+1 |
| * | | | | Improved issue sidebar | Phil Hughes | 2016-03-18 | 2 | -30/+29 |
* | | | | | Merge branch 'confidential-issues' into 'master' | Douwe Maan | 2016-03-18 | 12 | -13/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Restrict access to confidential issues on activity feed | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -1/+1 |
| * | | | | | Add eye-slash icon to confidential issues | Douglas Barbosa Alexandre | 2016-03-17 | 4 | -0/+5 |
| * | | | | | Restrict access for confidential issues on milestone view | Douglas Barbosa Alexandre | 2016-03-17 | 5 | -11/+11 |
| * | | | | | Fix issues count on project view | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -1/+1 |
| * | | | | | Add an option to user make an issue confidential | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -0/+9 |
| |/ / / / | |||||
* | | | | | Show a notice for diffs that are too largehide-large-diffs | Yorick Peterse | 2016-03-18 | 1 | -9/+13 |
* | | | | | Merge branch 'optimistic-todos' into 'master' | Jacob Schatz | 2016-03-18 | 2 | -5/+11 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Mark all as done through AJAX | Phil Hughes | 2016-03-17 | 2 | -3/+5 |
| * | | | | Removed the flash success message | Phil Hughes | 2016-03-17 | 1 | -1/+3 |
| * | | | | Adds small AJAX optimistic functionality to todos. | Jacob Schatz | 2016-03-17 | 2 | -3/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix_issue_mr_page_inconsistency' into 'master' | Jacob Schatz | 2016-03-17 | 2 | -13/+15 |
|\ \ \ \ | |||||
| * | | | | Fix inconsistency in the header of issue and merge request pages | Arinde Eniola | 2016-03-17 | 2 | -13/+15 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'download-dropdown-alignment' into 'master' | Jacob Schatz | 2016-03-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed alignment of download dropdowndownload-dropdown-alignment | Phil Hughes | 2016-03-16 | 1 | -1/+1 |
* | | | | | Merge branch 'edited-text' into 'master' | Robert Speicher | 2016-03-17 | 3 | -17/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed issue with timeago not firing | Phil Hughes | 2016-03-10 | 3 | -3/+3 |
| * | | | | | Fixed ruby issues from feedback | Phil Hughes | 2016-03-10 | 3 | -3/+3 |
| * | | | | | Edited timeago text on comments | Phil Hughes | 2016-03-10 | 3 | -17/+3 |
* | | | | | | Merge branch 'hide-builds-feature' into 'master' | Robert Speicher | 2016-03-17 | 2 | -63/+62 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Hide builds from Project's settings when the feature is disabledhide-builds-feature | Kamil Trzcinski | 2016-03-15 | 2 | -63/+62 |
* | | | | | | Merge branch 'dropdown-preselect-value' into 'master' | Robert Speicher | 2016-03-17 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removed label/milestone helper methodsdropdown-preselect-value | Phil Hughes | 2016-03-16 | 1 | -2/+2 |
| * | | | | | | Pre-selects values on issue and merge request dropdown | Phil Hughes | 2016-03-16 | 1 | -4/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '4009-external-users' into 'master' | Douwe Maan | 2016-03-17 | 4 | -5/+21 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into 4009-external-users4009-external-users | Zeger-Jan van de Weg | 2016-03-15 | 31 | -317/+318 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Improve external users feature | Zeger-Jan van de Weg | 2016-03-14 | 3 | -4/+6 |