summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_24815' into 'master' Sean McGivern2017-02-272-5/+9
|\
| * Fix issuable stale object error handler for js when updating tasklistsissue_24815Felipe Artur2017-02-242-5/+9
* | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-241-2/+2
* | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-2434-277/+277
|\ \
| * | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-2334-277/+277
* | | Merge branch 'create_branch_repo_less' into 'master' Robert Speicher2017-02-231-1/+38
|\ \ \ | |/ / |/| |
| * | Fixes after reviewcreate_branch_repo_lessValery Sizov2017-02-231-8/+2
| * | Create master branch first if project is repository-lessValery Sizov2017-02-231-1/+44
| |/
* | Revert "Enable Style/DotPosition"Douwe Maan2017-02-233-15/+15
* | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2318-150/+150
* | Enable Style/WordArrayDouwe Maan2017-02-232-3/+3
* | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-231-1/+2
* | Prefer leading style for Style/DotPositionDouwe Maan2017-02-2318-150/+150
* | Enable Style/DotPositionDouwe Maan2017-02-233-15/+15
* | Adds missing tests for all status accepted in scopeFilipa Lacerda2017-02-231-6/+9
* | Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabsFilipa Lacerda2017-02-238-60/+703
|\ \ | |/
| * Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-223-26/+430
| |\
| | * Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-213-26/+430
| * | fix rspec issue after delimiter fixNur Rony2017-02-221-1/+1
| |/
| * 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
| | | |_|/ | | |/| |
* | | | | Adds Pending and Finished tabs to pipelines pageFilipa Lacerda2017-02-161-1/+3
|/ / / /
* | | | 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
|/ /
View Lorry Controller Status