summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-192-8/+23
|\
| * Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-18186-1915/+2269
| |\
| * | Improve the "easy WIP & un-WIP from link" featureRémy Coutable2016-03-182-14/+19
| * | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-262-5/+15
* | | Merge branch 'label-tooltip' into 'master' Douwe Maan2016-03-193-3/+3
|\ \ \ | |_|/ |/| |
| * | Add label description in tooltip to labels in issue index and sidebarDouwe Maan2016-03-163-3/+3
* | | Merge branch 'refactor-ui-lists' into 'master' Dmitriy Zaporozhets2016-03-187-32/+35
|\ \ \
| * | | Refactor colors and listsDmitriy Zaporozhets2016-03-187-32/+35
* | | | 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 'filter-label-missing' into 'master' Robert Speicher2016-03-183-6/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes issue with filter label missing on labels & milestonesPhil Hughes2016-03-183-6/+6
| |/ / /
* | | | Merge branch 'rs-issue-14259' into 'master' Robert Speicher2016-03-181-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Prevent a 500 when a repository's root_ref is nilrs-issue-14259Robert Speicher2016-03-171-2/+4
* | | | Updated controller with before_actionPhil Hughes2016-03-182-2/+2
* | | | Fixes issue on dashboard issuesPhil Hughes2016-03-183-57/+57
* | | | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-181-2/+2
* | | | Merge branch 'improved-issue-sidebar' into 'master' Jacob Schatz2016-03-182-31/+33
|\ \ \ \
| * | | | Removed global JS varimproved-issue-sidebarPhil Hughes2016-03-181-2/+2
| * | | | Reused some variablesPhil Hughes2016-03-181-2/+5
| * | | | Links to user on collapsed issue sidebarPhil Hughes2016-03-181-1/+1
| * | | | Fixed issue when user doesnt existPhil Hughes2016-03-181-1/+1
| * | | | Improved issue sidebarPhil Hughes2016-03-182-30/+29
* | | | | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-1812-13/+27
|\ \ \ \ \
| * | | | | Restrict access to confidential issues on activity feedDouglas Barbosa Alexandre2016-03-171-1/+1
| * | | | | Add eye-slash icon to confidential issuesDouglas Barbosa Alexandre2016-03-174-0/+5
| * | | | | Restrict access for confidential issues on milestone viewDouglas Barbosa Alexandre2016-03-175-11/+11
| * | | | | Fix issues count on project viewDouglas Barbosa Alexandre2016-03-171-1/+1
| * | | | | Add an option to user make an issue confidentialDouglas Barbosa Alexandre2016-03-171-0/+9
| |/ / / /
* | | | | Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-9/+13
* | | | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-182-5/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Mark all as done through AJAXPhil Hughes2016-03-172-3/+5
| * | | | Removed the flash success messagePhil Hughes2016-03-171-1/+3
| * | | | Adds small AJAX optimistic functionality to todos.Jacob Schatz2016-03-172-3/+5
| | |/ / | |/| |
* | | | Merge branch 'fix_issue_mr_page_inconsistency' into 'master' Jacob Schatz2016-03-172-13/+15
|\ \ \ \
| * | | | Fix inconsistency in the header of issue and merge request pagesArinde Eniola2016-03-172-13/+15
| | |/ / | |/| |
* | | | Merge branch 'download-dropdown-alignment' into 'master' Jacob Schatz2016-03-171-1/+1
|\ \ \ \
| * | | | Fixed alignment of download dropdowndownload-dropdown-alignmentPhil Hughes2016-03-161-1/+1
* | | | | Merge branch 'edited-text' into 'master' Robert Speicher2016-03-173-17/+3
|\ \ \ \ \
| * | | | | Fixed issue with timeago not firingPhil Hughes2016-03-103-3/+3
| * | | | | Fixed ruby issues from feedbackPhil Hughes2016-03-103-3/+3
| * | | | | Edited timeago text on commentsPhil Hughes2016-03-103-17/+3
* | | | | | Merge branch 'hide-builds-feature' into 'master' Robert Speicher2016-03-172-63/+62
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Hide builds from Project's settings when the feature is disabledhide-builds-featureKamil Trzcinski2016-03-152-63/+62
* | | | | | Merge branch 'dropdown-preselect-value' into 'master' Robert Speicher2016-03-171-4/+4
|\ \ \ \ \ \
| * | | | | | Removed label/milestone helper methodsdropdown-preselect-valuePhil Hughes2016-03-161-2/+2
| * | | | | | Pre-selects values on issue and merge request dropdownPhil Hughes2016-03-161-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-174-5/+21
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-1531-317/+318
| |\ \ \ \ \ \
| * | | | | | | Improve external users featureZeger-Jan van de Weg2016-03-143-4/+6