summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-201-25/+40
|\
| * Don't use potentially slow ForkService in specdm-fix-editing-files-on-forks-quickDouwe Maan2017-02-201-4/+6
| * Fix issue where files on a fork could not be editedDouwe Maan2017-02-171-19/+32
* | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-202-0/+51
|\ \
| * | Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-202-0/+51
* | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-5/+20
|\ \ \
| * | | Todo done clicking is kind of unusable.Jacopo2017-02-171-5/+20
* | | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-172-0/+160
|\ \ \ \
| * | | | Use expect { }.to change { }use-update-runner-serviceLin Jen-Shin2017-02-152-18/+18
| * | | | Add some tests for admin/project runners pageLin Jen-Shin2017-02-152-0/+160
* | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-4/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove all instances of theme_id; require downtimeAnnabel Dunstone Gray2017-02-151-4/+2
| | |_|/ | |/| |
* | | | Merge branch 'paginate-environments-bundle' into 'master' Fatih Acet2017-02-161-9/+56
|\ \ \ \
| * \ \ \ Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundleFilipa Lacerda2017-02-161-9/+56
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-121-54/+10
| | |\ \ \
| | * | | | Add support for environment scopes in controllerGrzegorz Bizon2017-02-091-11/+48
| | * | | | Enable grouping and pagination in environmnets APIGrzegorz Bizon2017-02-091-8/+18
| | | |_|/ | | |/| |
* | | | | Merge branch '28176_merge_widget_fix' into 'master' Sean McGivern2017-02-161-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix error in MR widget after /merge slash commandJarka Kadlecova2017-02-161-3/+3
| | |_|/ | |/| |
* | | | 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
| | |_|_|/ | |/| | |
View Lorry Controller Status