summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Move all Pages related content to a single locationdocs/pagesAchilleas Pipinellis2017-02-281-1/+3
* Fix CSS classesAlex Sanford2017-02-271-3/+6
* Merge branch '27840-improve-search-bar-experience' into 'master' Annabel Dunstone Gray2017-02-271-1/+1
|\
| * Fix #27840 - Improve the search bar experience on mobilePratik Borsadiya2017-02-241-1/+1
* | Merge branch 'rss-btn-alignment-fix' into 'master' Annabel Dunstone Gray2017-02-273-3/+3
|\ \
| * | Fixed alignment of RSS button on activity pagesrss-btn-alignment-fixPhil Hughes2017-02-233-3/+3
* | | Merge branch 'ci-tables-ui-improvements' into 'master' Annabel Dunstone Gray2017-02-271-92/+0
|\ \ \
| * \ \ Merge branch 'master' into ci-tables-ui-improvementsci-tables-ui-improvementsFilipa Lacerda2017-02-2721-36/+61
| |\ \ \
| * \ \ \ Merge branch 'master' into ci-tables-ui-improvementsFilipa Lacerda2017-02-2321-413/+382
| |\ \ \ \
| * | | | | Remove unused fileFilipa Lacerda2017-02-221-92/+0
* | | | | | Add runner version to /admin/runners viewJonathon Reinhart2017-02-262-0/+3
| |_|/ / / |/| | | |
* | | | | Merge branch 'user-callouts' into 'master' Filipa Lacerda2017-02-243-0/+4
|\ \ \ \ \
| * | | | | Modified the user_callout behaviourJose Ivan Vargas2017-02-233-17/+3
| * | | | | Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-232-3/+2
| * | | | | Moved the dismiss-icon listener to close the callout to a buttonJose Ivan Vargas2017-02-231-1/+1
| * | | | | Changed the javascript class from using the global scope to exporting it via ...Jose Ivan Vargas2017-02-233-9/+4
| * | | | | Added CHANGELOG and corrected linter errorsJose Ivan Vargas2017-02-232-2/+2
| * | | | | Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-235-26/+22
| * | | | | Initial version of the user-calloutsJose Ivan Vargas2017-02-232-2/+30
| | |_|_|/ | |/| | |
* | | | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-243-5/+11
|\ \ \ \ \
| * | | | | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-093-5/+11
* | | | | | Merge branch '28366-renamed-file-tooltip-contains-html' into 'master' Filipa Lacerda2017-02-241-2/+2
|\ \ \ \ \ \
| * | | | | | Remove markup showing in tooltip for renamed files in diff view28366-renamed-file-tooltip-contains-htmlSam Rose2017-02-201-2/+2
* | | | | | | Merge branch 'boards-card-template-to-js' into 'master' Filipa Lacerda2017-02-242-11/+0
|\ \ \ \ \ \ \
| * | | | | | | Issue boards card in JSPhil Hughes2017-02-232-11/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '28367-fix-unfold-diff-line-number-copy-paste' into 'master' Jacob Schatz2017-02-241-2/+2
|\ \ \ \ \ \ \
| * | | | | | | fixes line number copy issue for unfolded parallel view diff28367-fix-unfold-diff-line-number-copy-pasteNur Rony2017-02-201-2/+2
* | | | | | | | Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-243-3/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't allow deleting a ghost user.Timothy Andrew2017-02-243-3/+9
* | | | | | | | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-244-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-234-4/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2438-490/+485
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' into 'master' Clement Ho2017-02-231-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | on branch deletion show loading icon and disabled the buttonwendy04022017-02-221-1/+1
| * | | | | | | | Enable Rails/DelegateDouwe Maan2017-02-231-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-2354-540/+498
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Code style improvementsAlfredo Sumaran2017-02-239-19/+47
| | * | | | | | Merge branch 'revert-2cf17c42' into 'master' Alfredo Sumaran2017-02-223-60/+59
| | |\ \ \ \ \ \
| | | * | | | | | Revert "Merge branch '27934-left-align-nav' into 'master'"revert-2cf17c42Annabel Dunstone Gray2017-02-213-60/+59
| | * | | | | | | Merge branch 'feature/brand-logo-in-emails' into 'master' Sean McGivern2017-02-226-333/+262
| | |\ \ \ \ \ \ \
| | | * | | | | | | use custom brand logo in pipeline mailsAlexis Reigel2017-02-221-1/+1
| | | * | | | | | | extract pipeline mails layoutAlexis Reigel2017-02-226-333/+262
| | * | | | | | | | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-221-0/+6
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-2125-176/+151
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | * | | | | | | | Remove empty line in noteblackst0ne2017-02-181-1/+0
| | | * | | | | | | | Merge branch 'add_mr_info_to_issues_list' of gitlab.com:blackst0ne/gitlab-ce ...blackst0ne2017-02-1739-87/+102
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Add merge request count to each issue on issues listblackst0ne2017-02-171-0/+6
| | | * | | | | | | | | Add merge request count to each issue on issues listblackst0ne2017-02-171-0/+6
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/master'blackst0ne2017-02-151-7/+8
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'blackst0ne2017-02-15117-470/+782
| | | |\ \ \ \ \ \ \ \ \ \