summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Use normal associations instead of polymorphic.Ruben Davila2017-02-072-2/+18
* Merge branch '8082-permalink-to-file' into 'master' Alfredo Sumaran2017-02-075-32/+46
|\
| * Add keyboard shortcut to move to file permalink8082-permalink-to-fileEric Eastwood2017-02-065-32/+46
* | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-0711-14/+86
|\ \
| * | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-0711-14/+86
* | | Merge branch '27632_fix_mr_widget_url' into 'master'Sean McGivern2017-02-071-2/+2
|\ \ \
| * | | Fix MR widget urlJarka Kadlecova2017-02-071-2/+2
| | |/ | |/|
* | | Merge branch 'fix/import-group-members' into 'master' Rémy Coutable2017-02-071-1/+1
|\ \ \
| * | | Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-071-1/+1
| |/ /
* | | Merge branch 'issue_19262' into 'master' Sean McGivern2017-02-071-0/+1
|\ \ \
| * | | Disallow system notes for closed issuablesissue_19262Felipe Artur2017-02-061-0/+1
* | | | Merge branch '26920-hover-cursor-on-pagination-element' into 'master' Filipa Lacerda2017-02-071-0/+14
|\ \ \ \
| * | | | fixes cursor issue on pipeline paginationNur Rony2017-02-071-0/+14
* | | | | Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipe...Kamil Trzciński2017-02-0715-61/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated the #create action to render the show view in case of a form errorJose Ivan Vargas2017-02-061-2/+2
| * | | | Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-062-5/+4
| * | | | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-061-2/+3
| * | | | Modified redirection logic in the variables cont.Jose Ivan Vargas2017-02-061-2/+3
| * | | | Added redirections to the index actions for the variables and triggers contro...Jose Ivan Vargas2017-02-062-0/+8
| * | | | Added a flash message to the creation of triggersJose Ivan Vargas2017-02-061-2/+3
| * | | | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-064-3/+11
| * | | | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-068-26/+17
| * | | | Added private methods to initialize variables in the ci_cd_pipelines_controllerJose Ivan Vargas2017-02-061-5/+16
| * | | | Corrected titles on the triggers and pipelines sectionsJose Ivan Vargas2017-02-063-3/+3
| * | | | Corrected tests and changed trigger controller redirects to the ci_cd_pipelin...Jose Ivan Vargas2017-02-061-3/+3
| * | | | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-14/+2
| * | | | Fixed badges testJose Ivan Vargas2017-02-061-1/+1
| * | | | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-067-12/+12
| * | | | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-0611-41/+57
* | | | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-078-45/+85
|\ \ \ \ \
| * | | | | List all groups/projects for admins on explore pagesDouwe Maan2017-02-061-1/+1
| * | | | | Fix indentationee-1439-read-only-userDouwe Maan2017-02-061-4/+4
| * | | | | More backportDouwe Maan2017-02-061-4/+13
| * | | | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-063-7/+28
| * | | | | Backport UI changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-062-22/+23
| * | | | | Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-063-21/+30
| | |_|/ / | |/| | |
* | | | | Merge branch '27343-autocomplete-post-to-wrong-url-when-not-hosting-in-root' ...Filipa Lacerda2017-02-071-1/+1
|\ \ \ \ \
| * | | | | Fix filtered search user autocomplete for gitlab instances that are hosted on...27343-autocomplete-post-to-wrong-url-when-not-hosting-in-rootClement Ho2017-02-061-1/+1
* | | | | | Merge branch 'commit-description-border' into 'master' Alfredo Sumaran2017-02-061-1/+0
|\ \ \ \ \ \
| * | | | | | Remove lighter colored commit description bordercommit-description-borderAnnabel Dunstone Gray2017-02-061-1/+0
| |/ / / / /
* | | | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-0632-256/+672
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Use webpack to require filesFilipa Lacerda2017-02-0511-44/+42
| * | | | | Use webpack to require filesFilipa Lacerda2017-02-055-15/+15
| * | | | | Move interceptor to common interceptors filesFilipa Lacerda2017-02-051-0/+8
| * | | | | Use webpackFilipa Lacerda2017-02-054-74/+55
| * | | | | Move repeated function to utilitiesFilipa Lacerda2017-02-051-0/+8
| * | | | | Fix broken path to fileFilipa Lacerda2017-02-051-1/+1
| * | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-04108-302/+303
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0380-176/+1231
| |\ \ \ \ \
| * | | | | | Fix broken testsFilipa Lacerda2017-02-031-0/+1