summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_17302' into 'master' Rémy Coutable2016-05-181-3/+64
|\ | | | | | | | | | | | | Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
| * Fix single note api requestFelipe Artur2016-05-161-3/+14
| |
| * Fix notes API calls symbol convertionsFelipe Artur2016-05-101-0/+31
| |
| * Fix api leaking notes when user is not authorized to read noteableFelipe Artur2016-05-091-0/+19
| |
* | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-163-10/+69
|\ \ | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * | Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-162-12/+35
| | |
| * | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-163-6/+9
| | |
| * | Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+33
| | |
* | | Merge branch 'wiki-fix-reloaded' into 'master' Rémy Coutable2016-05-161-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
| * | | Use the relative url prefix for links in WikiArtem Sidorenko2016-05-131-1/+2
| | | |
* | | | Merge branch 'unexpected-filtering-on-merge-requests' into 'master' Rémy Coutable2016-05-161-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for unintentional filtering bug in MR !3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues. This MR has complementary tests for MR list. See merge request !4154
| * | | | Add tests for unintentional filtering bug in MR (cf. !3872)Takuya Noguchi2016-05-151-0/+15
| | | | |
* | | | | Merge branch ↵Douwe Maan2016-05-162-67/+146
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master' Make upcoming milestone work across projects Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated). Closes #17227. See merge request !4125
| * | | | | Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestonesSean McGivern2016-05-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres only needs to select a single column, so that can used as a sub-query where `Milestone.upcoming_ids_by_projects` is actually used in `IssuableFinder`. MySQL needs to select the `due_date` column because it's used in the `HAVING` clause, so it has to return an array of IDs.
| * | | | | Make upcoming milestone work across projectsSean McGivern2016-05-162-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before: we took the next milestone due across all projects in the search and found issues whose milestone title matched that one. Problems: 1. The milestone could be closed. 2. Different projects have milestones with different schedules. 3. Different projects have milestones with different titles. 4. Different projects can have milestones with different schedules, but the _same_ title. That means we could show issues from a past milestone, or one that's far in the future. After: gather the ID of the next milestone on each project we're looking at, and find issues with those milestone IDs. Problems: 1. For a lot of projects, this can return a lot of IDs. 2. The SQL query has to be different between Postgres and MySQL, because MySQL is much more lenient with HAVING: as well as the columns appearing in GROUP BY or in aggregate clauses, MySQL allows them to appear in the SELECT list (un-aggregated).
| * | | | | Tidy up IssuesFinder specsSean McGivern2016-05-161-68/+80
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | - Don't do setup in spec bodies. - Don't `describe` a symbol. - Don't use 'should'.
* | | | | Merge branch ↵Robert Speicher2016-05-162-0/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master' Force password change after admin reset Closes #13691. See merge request !4016
| * | | | | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-162-0/+79
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | When an admin changes a user's password for them, force the user to reset the password after logging in by expiring the new password immediately.
* | | | | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-164-0/+349
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| * | | | | Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-151-11/+6
| | | | | |
| * | | | | Improve authentication service specsKamil Trzcinski2016-05-152-16/+56
| | | | | |
| * | | | | Update JwtController specsKamil Trzcinski2016-05-151-36/+21
| | | | | |
| * | | | | Added specs for JwtControllerKamil Trzcinski2016-05-141-0/+87
| | | | | |
| * | | | | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-143-3/+3
| | | | | |
| * | | | | Fix authentication serviceKamil Trzcinski2016-05-141-0/+1
| | | | | |
| * | | | | Rename specsKamil Trzcinski2016-05-141-1/+1
| | | | | |
| * | | | | Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-141-1/+1
| | | | | |
| * | | | | Fix specsKamil Trzcinski2016-05-141-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1398-1096/+1354
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | | | | Fix CI testsKamil Trzcinski2016-05-123-30/+30
| | | | | |
| * | | | | Added rspec for testing container registry authentication serviceKamil Trzcinski2016-05-093-0/+241
| | | | | |
* | | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-163-32/+100
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix validation method for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-2/+16
| | | | | |
| * | | | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-132-88/+57
| | | | | |
| * | | | | Import PRs where branch names were reused across PRsDouglas Barbosa Alexandre2016-05-131-6/+26
| | | | | |
| * | | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-132-2/+19
| | | | | |
| * | | | | Fix spec for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-131-22/+70
| | |/ / / | |/| | |
* | | | | Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-151-5/+11
| |_|/ / |/| | |
* | | | Update specsDouwe Maan2016-05-133-78/+4
| | | |
* | | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-131-0/+74
| | | |
* | | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-131-6/+2
|/ / /
* | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-1312-45/+45
| | |
* | | Merge branch 'fix_health_check_type' into 'master' Douwe Maan2016-05-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix minor typos in admin health check page Fix minor typos from gitlab-org/gitlab-ce!3888 cc/ @DouweM @twk3 See merge request !4134
| * | | Fix minor typos in admin health check pageDrew Blessing2016-05-121-1/+1
| | | |
* | | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133
| * | | | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
| | | | |
* | | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-123-7/+7
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| * | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-083-7/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* | | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-122-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a description for default scope on builds Should be "**All* builds (from this project)" for the {project,admin} builds page without scope. Fix a regression on !2243 (#4240). See merge request !4118
| * | | | Fix a description for default scope on buildsTakuya Noguchi2016-05-132-0/+2
| | | | |