summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' ↵Sean McGivern2017-07-261-0/+21
|\ | | | | | | | | | | | | | | | | into 'master' Fixes 500 error caused by pending delete projects in admin dashboard Closes #35453 See merge request !13067
| * Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-0/+21
| |
* | Merge branch '30634-protected-pipeline' into 'master'Kamil Trzciński2017-07-252-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
| * \ Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-207-14/+126
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (130 commits) Change auto-retry count to a correct value in docs Fix background migration cleanup specs Fix CI/CD job auto-retry specs Fix JS; make buttons sr accessibile; fix overlay remove redundant changelog entries Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3' Merge branch '33303-404-for-unauthorized-project' into 'security-9-3' Merge branch '33359-pers-snippet-files-location' into 'security-9-3' Merge branch 'bvl-remove-appearance-symlink' into 'security-9-3' Hide description about protected branches to non-member Update CHANGELOG.md for 9.0.11 Update CHANGELOG.md for 9.1.8 Update CHANGELOG.md for 8.17.7 Update CHANGELOG.md for 9.2.8 Update CHANGELOG.md for 9.3.8 Respect blockquote line breaks in markdown 35209 Add wip message to new navigation preference section Add github imported projects count to usage data Add versions to Prometheus metrics doc Add Bulgarian translations of Pipeline Schedules ...
| * | | Instead of adding master, stub_not_protect_default_branchLin Jen-Shin2017-07-182-6/+11
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into 30634-protected-pipelineLin Jen-Shin2017-07-1734-207/+866
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (638 commits) Simplify background migrations stealing code Expire cached user IDs that can see the performance after 5 minutes Promote visibility level helpers from Group to Namespace Fix off-by-one error in background migration retries Recover from all exceptions when stealing bg migration Fix label creation from new list for subgroup projects move click handler to button. when on the icon it wasn't triggered in firefox Fix incorrect AWS ELB metrics. Fix wrong link to docs in docs styleguide Update issue-related docs Refactor groups docs Add subgroups limitations to Pages docs Update Google launcher details Split docs on IP whitelist for monitoring access Update health check docs Bump fog-core to 1.44.3 and fog providers' plugins to latest Introduce have_gitlab_http_status Remove Repository#search_files Update Pipeline's badge count in Merge Request and Commits view to match real-time content Fixes the user order being overriden in the autocomplete controller ...
| * | | | Update tests due to permission changesLin Jen-Shin2017-07-042-9/+9
| | | | |
* | | | | Merge branch 'dz-update-shoulda' into 'master'Rémy Coutable2017-07-253-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Update shoulda-matchers gem to 3.1.2 See merge request !13040
| * | | | Remove unnecessary set_flash.now from controller specsDmitriy Zaporozhets2017-07-243-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-241-19/+40
|/ / / /
* | | | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-221-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline badge improvements Closes #15582 and #20961 See merge request !12966
| * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-211-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This commit is renaming files and classes from build to pipeline. Also wording is editted to pipeline. Given `pipeline` had more characters than `build`, I've made the field a bit wider. The width now matchers the one for the coverage badge, so they look nice when in a table format, or in a list. As soon as this commit is merged to master, and released, the build.svg is deprecated, meaning that all users which already placed a badge should update it. However, to make sure it keeps working tests are added for this case.
* | | | | Merge branch '34549-extract-devise-mappings-into-helper' into 'master'Rémy Coutable2017-07-211-3/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper Closes #34549 See merge request !12742
| * | | | Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test ↵Jacopo2017-07-201-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helper Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]` in our tests into the helper method `set_devise_mapping`
* | | | | Wrong data type when testing webhooksAlexander Randa2017-07-201-0/+21
| |_|_|/ |/| | |
* | | | Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-0/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docker tag reference routing constraints Closes #35220 and gitlab-com/support-forum#2246 See merge request !12961
| * | | | Fix docker tag reference routing constraintsGrzegorz Bizon2017-07-191-0/+48
| | |_|/ | |/| |
* | | | Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-191-0/+30
| | | | | | | | | | | | | | | | | | | | [9.3 security fix] Renders 404 if given project is not readable by the user on Todos dashboard See merge request !2118
* | | | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-192-6/+6
| | | | | | | | | | | | | | | | | | | | Use uploads/system directory for personal snippets See merge request !2123
* | | | Merge branch '34930-fix-edited-by' into 'master'Sean McGivern2017-07-191-0/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue detail if user who last edited an issue was deleted Closes #34930 See merge request !12933
| * | | | Use Ghost user when edited_by, merged_by deleted34930-fix-edited-byJarka Kadlecova2017-07-191-0/+30
| |/ / /
* | | | Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
| * | | | Added authentiq provider to tests and updated documentation, gem and config ↵Alexandros Keramidas2017-07-181-1/+1
| | |/ / | |/| | | | | | | | | | file.
* | | | Merge branch 'issue_35132' into 'master'Sean McGivern2017-07-191-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix external issue trackers redirect Closes #35132 See merge request !12923
| * | | | Fix external issue trackers redirectissue_35132Felipe Artur2017-07-181-6/+10
| | |/ / | |/| |
* | | | Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-191-1/+1
|/ / /
* | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
| * | | Add unit to latency metrics.Ben Kochie2017-07-121-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `seconds` unit to latency metrics based on uptream naming convention[0]. [0]: https://prometheus.io/docs/practices/naming/#metric-names
* | | | Merge branch ↵Sean McGivern2017-07-141-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix-exact-matches-of-username-and-email-on-top-of-the-user-search' into 'master' Fixes the user order being overriden in the autocomplete controller See merge request !12868
| * | | | Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-141-0/+15
| | | | |
* | | | | Update Pipeline's badge count in Merge Request and Commits view to match ↵Filipa Lacerda2017-07-142-2/+4
| | | | | | | | | | | | | | | | | | | | real-time content
* | | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' ↵Sean McGivern2017-07-141-11/+30
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Recover from renaming project that has container images Closes #23019 See merge request !12840
| * | | | Remove one assertion from projects controller specsGrzegorz Bizon2017-07-141-3/+2
| | | | |
| * | | | Fix rubocop offense in projects controller specsGrzegorz Bizon2017-07-141-1/+1
| | | | |
| * | | | Recover from renaming project that has container imagesGrzegorz Bizon2017-07-131-11/+31
| |/ / /
* | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-142-0/+38
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-132-0/+38
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-113-49/+155
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * | | Differentiate shared test context using options hash instead of subject.33949-remove-healthcheck-access-tokenPawel Chojnacki2017-07-102-5/+7
| | | | | | | | | | | | | | | | | | | | + fix typos, and capitalization + point configuration to `gitlab.rb` as well
| * | | Add tests for token auth.Pawel Chojnacki2017-07-062-16/+59
| | | |
| * | | Add spaces between test phasesPawel Chojnacki2017-07-052-2/+19
| | | | | | | | | | | | | | | | + fix wrong test setup
| * | | Finish refactring processed configuraiton, and add test validating ip range ↵Pawel Chojnacki2017-07-051-7/+21
| | | | | | | | | | | | | | | | matching
| * | | Bring back healthcheck token access to monitoring resources, but mark this ↵Pawel Chojnacki2017-07-051-0/+16
| | | | | | | | | | | | | | | | as deprecated
| * | | Remove the need to use health check tokenPawel Chojnacki2017-07-053-36/+50
| | |/ | |/| | | | | | | | | | in favor of whitelist that will be used to control the access to monitoring resources
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-113-3/+31
| |/ |/|
* | Merge branch ↵Kamil Trzciński2017-07-071-36/+294
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
| * \ Merge from master(Fix conflicts)Shinya Maeda2017-07-073-3/+78
| |\ \
| * \ \ merge from masterShinya Maeda2017-07-0719-65/+55
| |\ \ \
| * | | | Remove validates :key, uniqueness due to new validator covers the casefeature/intermediate/32568-adding-variables-to-pipelines-schedulesShinya Maeda2017-07-071-34/+64
| | | | |
| * | | | Reduce less meaningful test suits from pipeline_schedules_controller_spec.rbShinya Maeda2017-07-061-108/+0
| | | | |
View Lorry Controller Status