summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-4/+5
|\
| * Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-4/+5
* | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
|/
* Revert "Merge branch 'gl-dropdown-issuable-form' into 'master'"revert-bdb6f1e6Douwe Maan2016-07-151-1/+1
* Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-6/+3
|\
| * use %(...) and %[...] in favor of %<...>feature.rouge-20http://jneen.net/2016-07-141-1/+1
| * kill the nowrap optionhttp://jneen.net/2016-07-141-2/+3
| * rm dead `highlighter` methodhttp://jneen.net/2016-07-141-4/+0
* | Merge branch '17341-firefox-u2f' into 'master' Robert Speicher2016-07-151-0/+5
|\ \
| * | Load Javascript U2F library selectively.Timothy Andrew2016-07-141-0/+5
* | | Merge branch 'update-permissions-links' into 'master' Achilleas Pipinellis2016-07-151-1/+1
|\ \ \
| * | | Update permissons links to new pageupdate-permissions-linksSean McGivern2016-07-141-1/+1
* | | | Merge branch 'gl-dropdown-issuable-form' into 'master' Jacob Schatz2016-07-151-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Updated testsPhil Hughes2016-07-071-1/+1
* | | | Merge branch 'top-links-label' into 'master' Fatih Acet2016-07-141-1/+1
|\ \ \ \
| * | | | Aria labels on top header linkstop-links-labelPhil Hughes2016-07-121-1/+1
* | | | | Merge branch 'issuable-author-tooltip' into 'master' Fatih Acet2016-07-142-3/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed Rubocopissuable-author-tooltipPhil Hughes2016-07-131-2/+1
| * | | | Added author username tooltip in issuable headerPhil Hughes2016-07-122-3/+5
| |/ / /
* | | | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* | | | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-131-1/+1
* | | | Change running status color to blue; update icon to spinnerAnnabel Dunstone2016-07-121-1/+3
* | | | Add new stopwatch and commit icons; rename custom icon helper; fix commit pip...Annabel Dunstone2016-07-121-1/+1
* | | | Merge branch 'approval-required-todo' into 'master' Robert Speicher2016-07-121-0/+1
|\ \ \ \
| * | | | Add approval required todosapproval-required-todoSean McGivern2016-07-121-0/+1
| |/ / /
* | | | Cache todos pending/done dashboard query countsPaco Guzman2016-07-121-2/+2
|/ / /
* | | Merge branch 'copy-to-clipboard-tooltip' into 'master' Rémy Coutable2016-07-121-19/+3
|\ \ \
| * | | Display tooltip for "Copy to Clipboard" button (!5164)winniehell2016-07-111-19/+3
| | |/ | |/|
* | | Merge branch 'quick-start-ci-route' into 'master' Douwe Maan2016-07-121-9/+9
|\ \ \
| * | | Update the help_page_path route to accept paths directly instead of using par...Connor Shea2016-07-111-9/+9
* | | | Merge branch 'master' into faster-diffsfaster-diffsJacob Schatz2016-07-115-11/+34
|\ \ \ \ | |/ / /
| * | | Merge branch 'mr-close-btn' into 'master' Robert Speicher2016-07-111-0/+4
| |\ \ \
| | * | | Moved merge request button visibility out of issue_helpermr-close-btnPhil Hughes2016-07-112-1/+5
| | * | | Correctly shows close button on merge requestsPhil Hughes2016-07-041-1/+1
| * | | | Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-111-9/+11
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into single-file-diffsSean McGivern2016-07-111-0/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Support renames in diff_for_path actionsSean McGivern2016-07-111-2/+6
| | * | | | Make expand_all param more explicitSean McGivern2016-07-081-2/+2
| | * | | | DRY up diff_for_path actionsSean McGivern2016-07-081-21/+3
| | * | | | Allow expanding all diffs at onceSean McGivern2016-07-081-0/+4
| | * | | | Ensure only renderable text diffs are collapsedSean McGivern2016-07-081-0/+1
| | * | | | Disable overflow messagesSean McGivern2016-07-081-9/+1
| | * | | | Collapse large diffs by defaultSean McGivern2016-07-081-0/+19
| * | | | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-111-0/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use Gitlab-Workhorse-Send-Data to send entry:Lin Jen-Shin2016-07-051-0/+6
| * | | | | Merge branch 'retrieve-mr-closes-issues-just-when-required' into 'master' Rémy Coutable2016-07-081-0/+4
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Avoid calculation of closes_issues.retrieve-mr-closes-issues-just-when-requiredPaco Guzman2016-07-071-0/+4
| | | |_|/ | | |/| |
| * | | | Revert "Revert "Merge branch 'issue_3946' into 'master' ""Robert Speicher2016-07-071-1/+1
| * | | | Revert "Merge branch 'issue_3946' into 'master' "Robert Speicher2016-07-071-1/+1
| * | | | Merge branch '18181-pipeline-duration' into 'master' Robert Speicher2016-07-071-0/+7
| |\ \ \ \