summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '34116-milestone-filtering-on-group-issues' into 'master'Sean McGivern2017-07-031-0/+15
|\
| * Add tests for Groups::MilestonesController#indexTakuya Noguchi2017-06-261-0/+15
* | Merge branch 'hb-fix-abuse-report-on-stale-user-profile' into 'master'Douwe Maan2017-06-291-0/+25
|\ \
| * | Fix errors caused by attempts to report already blocked or deleted usersHoracio Bertorello2017-06-281-0/+25
* | | Merge branch '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-...Douwe Maan2017-06-291-0/+53
|\ \ \
| * | | Fix saShinya Maeda2017-06-281-3/+1
| * | | use go instead of let procShinya Maeda2017-06-281-45/+39
| * | | Fixed typo and hash alighmentShinya Maeda2017-06-281-1/+3
| * | | Fix static analysisShinya Maeda2017-06-281-1/+1
| * | | IMprove access_matchersShinya Maeda2017-06-281-1/+2
| * | | Fix static analysysShinya Maeda2017-06-281-3/+3
| * | | Add changelog. Add AccessMatchersForControllerShinya Maeda2017-06-281-0/+58
| |/ /
* | | Split up MergeRequestsControllerdm-merge-request-creations-controllerDouwe Maan2017-06-285-598/+599
|/ /
* | update preferences controllerJames Lopez2017-06-231-2/+3
|/
* Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-2219-190/+193
|\
| * Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2118-183/+183
| * Disable environment list polling as it breaks deployboardKamil Trzcinski2017-06-211-2/+4
| * Merge branch 'tc-fix-group-finder-subgrouping' into 'master'Douwe Maan2017-06-161-4/+5
| |\
| | * Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-4/+5
| * | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-161-1/+1
| |\ \
| | * | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-1/+1
| | |/
* | | Make queries not die when underlying data cannot be foundPawel Chojnacki2017-06-201-2/+2
* | | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-201-0/+30
* | | Move Prometheus service to project modelPawel Chojnacki2017-06-162-2/+2
* | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-1631-256/+646
|\ \ \ | |/ /
| * | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-151-2/+2
| * | Add columns for custom notification settingsSean McGivern2017-06-151-2/+8
| |/
| * Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-1421-91/+280
| * Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-141-7/+30
| |\
| | * Update tests and applicationfix-external-ci-servicesKamil Trzcinski2017-06-131-7/+30
| * | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-1318-91/+272
| |\ \ | | |/
| | * Merge branch 'use-request-store-helper-instead-actual-code' into 'master'Douwe Maan2017-06-123-23/+4
| | |\
| | | * Use :request_store hooks on specsuse-request-store-helper-instead-actual-codeOswaldo Ferreira2017-06-093-23/+4
| | * | Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2Stan Hu2017-06-101-0/+1
| | * | Revert 'New file from interface on existing branch'dm-revert-mr-8427Douwe Maan2017-06-091-14/+0
| | |/
| | * Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-091-0/+38
| | |\
| | | * Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-091-0/+38
| | * | Merge branch 'use-request-store-on-mr-controller-query-count-spec' into 'master'Douwe Maan2017-06-081-1/+6
| | |\ \
| | | * | Use RequestStore on MR show.json query count specuse-request-store-on-mr-controller-query-count-specOswaldo Ferreira2017-06-081-1/+6
| | * | | Merge branch 'master-security-update' into 'master'Regis Boudinot2017-06-081-10/+20
| | |\ \ \
| | | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-10/+20
| | | |/ /
| | * | | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-081-3/+3
| | |\ \ \ | | | |/ /
| | | * | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
| | | |/
| | * | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0715-123/+327
| | |\ \ | | | |/
| | | * Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-0/+31
| | | * Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+1
| | | |\
| | | | * spec updatesPhil Hughes2017-05-311-1/+1
| | | * | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-072-39/+70
| | | |\ \
| | | | * | Do not cleanup temp directory as this apparently causes silent rspec failures...Pawel Chojnacki2017-06-071-8/+2
| | | | * | Add prometheus text formatterPawel Chojnacki2017-06-021-6/+6