summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'filter-branch-by-name' into 'master' Douwe Maan2016-07-251-0/+11
|\
| * Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-229-70/+106
| |\
| * | implements the basic filter functionalitytiagonbotelho2016-07-191-0/+11
* | | Remove magic comments from Ruby files (!5456)winniehell2016-07-241-1/+0
| |/ |/|
* | fix missing repo_ref parambarthc2016-07-221-1/+2
* | Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-212-34/+19
|\ \
| * | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-202-34/+19
* | | Fix ci icons getting cut offAnnabel Dunstone2016-07-211-2/+2
* | | Cast duration to integer in `TimeHelper#time_interval_in_words`Rémy Coutable2016-07-211-0/+1
|/ /
* | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-201-1/+4
|\ \
| * \ Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-202-20/+20
| |\ \
| * | | Use switch statements instead of if/else chains.Connor Shea2016-07-191-2/+3
| * | | Starting work on the warn_on_failure feature for the MR build status.Connor Shea2016-07-191-0/+4
| | |/ | |/|
* | | Merge branch 'add-link-to-commit-avatar' into 'master' Rémy Coutable2016-07-202-10/+30
|\ \ \
| * | | Add link to user profile to commit avatar (!5163)winniehell2016-07-202-10/+30
* | | | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-201-0/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor service settings viewissue_8110Felipe Artur2016-07-201-7/+7
| * | | Add project service documentation and update integration documentationFelipe Artur2016-07-191-2/+2
| * | | Allow slack service to send messages on different channelsFelipe Artur2016-07-191-0/+25
| | |/ | |/|
* | | Merge branch 'external-wiki-helper-speedup' into 'master' Yorick Peterse2016-07-201-3/+2
|\ \ \ | |/ / |/| |
| * | speed up ExternalWikiService#get_project_wiki_pathEugene Howe2016-07-191-3/+2
| |/
* | Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' Kamil Trzciński2016-07-191-13/+13
|\ \
| * | Fix build duration when build is not finished yet19937-fix-wrong-build-elapsed-timeRémy Coutable2016-07-181-13/+13
* | | Add new icons for every CI statusAnnabel Dunstone2016-07-191-6/+8
* | | Add new running icon; add a bunch of styles to get svg to match existing fa i...Annabel Dunstone2016-07-191-2/+2
| |/ |/|
* | 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
| |/ / /