summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-151-0/+22
* Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-131-10/+9
|\
| * Make deploy key not show in User's keys listPawel Chojnacki2017-02-131-10/+9
* | Merge branch 'option-to-be-notified-of-own-activity' into 'master' Douwe Maan2017-02-131-0/+45
|\ \ | |/ |/|
| * Use `let` in Profiles::NotificationsController specRichard Macklin2017-02-031-12/+9
| * Add missing newline in Profiles::NotificationsController specRichard Macklin2017-02-011-0/+1
| * Add notified_of_own_activity to permitted attributesRichard Macklin2017-02-011-1/+2
| * Add controller spec for Profiles::NotificationsControllerRichard Macklin2017-02-011-0/+46
* | Merge branch 'issue_25900_2' into 'master' Sean McGivern2017-02-133-0/+25
|\ \
| * | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-093-0/+25
* | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-101-54/+10
|/ /
* | Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master' Fatih Acet2017-02-071-1/+7
|\ \
| * | Fix merge request controller specs for new actionfix/gb/invalid-new-merge-request-apiGrzegorz Bizon2017-02-071-1/+7
* | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-072-17/+74
|\ \ \ | |/ / |/| |
| * | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-072-17/+74
* | | Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipe...Kamil Trzciński2017-02-072-0/+79
|\ \ \
| * | | Fixed variables_controller_spec.rb test26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pagesJose Ivan Vargas2017-02-061-2/+1
| * | | Improved code styling on the variables_controller_specJose Ivan Vargas2017-02-061-7/+11
| * | | Added tests for the variables controller #update actionJose Ivan Vargas2017-02-061-1/+26
| * | | Added a variable_controller_spec test to test for flash messages on the #crea...Jose Ivan Vargas2017-02-062-0/+31
| * | | Fixed tests, renamed files and methodsJose Ivan Vargas2017-02-061-1/+1
| * | | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-0/+20
* | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-061-19/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-041-0/+11
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-032-27/+51
| |\ \ \
| * | | | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-031-8/+1
| * | | | Add basic specs for new merge requests pipelines APIGrzegorz Bizon2017-02-031-11/+23
* | | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-061-0/+64
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-063-27/+62
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-033-3/+143
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix 500 error while navigating to the `pages_domains` 'show' page.Timothy Andrew2017-01-311-0/+64
| | |_|_|/ | |/| | |
* | | | | Add traits for ProjectFeatures to Project factorySemyon Pupkov2017-02-051-13/+3
| |_|/ / |/| | |
* | | | Merge branch 'git_to_html_redirection' into 'master' Sean McGivern2017-02-031-0/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed redirection from http://someproject.git to http://someprojectblackst0ne2017-02-041-0/+11
| | |/ | |/|
* | | Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-031-26/+50
* | | Fix spec for Projects::Boards::ListsControllerDouglas Barbosa Alexandre2017-02-031-1/+1
|/ /
* | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-1/+2
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-025-17/+128
| |\ \ | | |/
| * | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2643-74/+67
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2616-47/+358
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0416-238/+585
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-102-2/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-082-1/+63
| |\ \ \ \ \ \
| * | | | | | | Fix tests to use the new APILin Jen-Shin2016-12-081-1/+2
* | | | | | | | Use `add_$role` helper in snippets specssnippet-spamSean McGivern2017-02-021-4/+4
* | | | | | | | Check public snippets for spamSean McGivern2017-02-022-0/+139
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch '24021-Migrate-Projects-Labels-to-Group-Labels' into 'master'27283-fix-wrong-label-hide-show-whitespaceSean McGivern2017-01-311-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Abillity to promote project labels to group labelsRitave2017-01-311-0/+45
* | | | | | | | Merge branch 'zj-display-error-team-fetch' into 'master' Kamil Trzciński2017-01-311-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix inconsistent return typeZ.J. van de Weg2017-01-241-2/+2
View Lorry Controller Status