summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '34116-milestone-filtering-on-group-issues' into 'master'Sean McGivern2017-07-031-0/+15
|\ | | | | | | | | | | | | Use correct milestones for filtering on Group Issues Closes #34116 See merge request !12374
| * 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 users Closes #8928 See merge request !12502
| * | Fix errors caused by attempts to report already blocked or deleted usersHoracio Bertorello2017-06-281-0/+25
| | |
* | | Merge branch ↵Douwe Maan2017-06-291-0/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33082-use-update_pipeline_schedule-for-edit-and-take_ownership-in-pipelineschedulescontroller' into 'master' Use authorize_update_pipeline_schedule in PipelineSchedulesController Closes #33082 See merge request !11846
| * | | 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-review-branchPawel Chojnacki2017-06-2219-190/+193
|\ | | | | | | 28717-additional-metrics-review-branch
| * 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
| |\ | | | | | | | | | | | | | | | | | | Show private subgroups if member of parent group Closes #32135 See merge request !11764
| | * Subgroups page should show groups authorized through inheritanceToon Claes2017-06-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user is authorized to a group, they are also authorized to see all the ancestor groups and descendant groups. When a user is authorized to a project, they are authorized to see all the ancestor groups too. Closes #32135 See merge request !11764
| * | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
| | * | Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* | | 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 ↵Pawel Chojnacki2017-06-1631-256/+646
|\ \ \ | |/ / | | | | | | 28717-additional-metrics-review-branch
| * | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-151-2/+2
| | | | | | | | | | | | | | | | | | Create a post-deployment migration to update all existing notification settings with at least one custom level enabled to the new format. Also handle the same conversion when updating settings, to catch any stragglers.
| * | Add columns for custom notification settingsSean McGivern2017-06-151-2/+8
| |/ | | | | | | | | | | Add columns for each custom notification level, defaulting to null. Read from those columns if non-null, otherwise fall back to the serialized column. Writing will write to the new column if `events` isn't manually set.
| * 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
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (34 commits) Revert "Merge branch 'karma-headless-chrome' into 'master'" Make small pipeline schedules UI enhancements. Remove js classes from vue component that are not needed in vue component Update tests and application Adds "Pipeline" to job's sidebar Change border color of job's scroll controllers to $border-color Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Added Tectonic to the page. Always check read_issue permissions when loading issue Handle legacy jobs without name Do not expose internal artifacts hash in build entity Use wait_for_requests instead of sleep 0.3 Limit wiki container width Fix migrations testing support RSpec hooks order Rename BuildEntity to JobEntity Fix support for external_url for commit statuses Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them add CHANGELOG.md entry for !12036 remove phantomjs-specific test hacks update karma job to use chrome build image created by gitlab-build-images!41 ...
| | * 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
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (460 commits) Center dropdown for pipeline's mini graph Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions Fix filename method of GitlabUploader to return always real filename Ignore CVE-2017-5029 in Nokogiri Refactor atom builder by using xml.atom layout Let PhantomJS load local images Add a changelog entry Only add a description change note when no tasks are updated Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1) Use gitaly 0.11.2 Add the ability to perform background migrations Always render warnings icon in orange Fix a few translation for zh_TW Improve Job detail view to make it refreshed in real-time instead of reloading Attempts to run RSpec tests twice (1 retry) ignore name validation on importing Only show hover state on links and buttons Use vue files for navigation tabs and buttons doc: add example of scheduler when Add test for u2f helper and changelog entry ...
| | * Merge branch 'use-request-store-helper-instead-actual-code' into 'master'Douwe Maan2017-06-123-23/+4
| | |\ | | | | | | | | | | | | | | | | Use :request_store hooks on specs See merge request !12058
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was possible when an issue was updated and Akismet flagged it as spam that the reCAPTCHA configuration was not loaded. Closes #33532
| | * | 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 loading Closes #33477 See merge request !12023
| | | * Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-091-0/+38
| | | | | | | | | | | | | | | | Closes #33477
| | * | 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 spec See merge request !12024
| | | * | 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Master security update See merge request !12025
| | | * | | Merge branch 'dz-restrict-autocomplete' into 'security-9-1'DJ Mountney2017-06-081-10/+20
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Allow users autocomplete by author_id only for authenticated users See merge request !2100
| | * | | 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
| | | |/ | | | | | | | | | | | | | | | | They can admin group labels anyway, we weren't checking the more specific permission.
| | * | 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
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820
| | | | * spec updatesPhil Hughes2017-05-311-1/+1
| | | | |
| | | * | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-072-39/+70
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| | | | * | Do not cleanup temp directory as this apparently causes silent rspec ↵Pawel Chojnacki2017-06-071-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | failures on linux in CI
| | | | * | Add prometheus text formatterPawel Chojnacki2017-06-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + rename controler method to #index from #metrics + remove assertion from nullMetric