summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-231-1/+1
|
* Merge branch 'rm-source-branch' into 'master' Douwe Maan2016-05-201-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | Allows MR authors to have the source branch removed when merging the MR closes #13191 The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously. Screenshot: ![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png) See merge request !2801
| * Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+6
| |
* | Merge branch 'issue-17537-fix' into 'master' Douwe Maan2016-05-201-0/+18
|\ \ | | | | | | | | | | | | | | | | | | Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref Closes #17537 See merge request !4151
| * | Fix Error 500 when attempting to retrieve project license when HEAD points ↵Stan Hu2016-05-141-0/+18
| | | | | | | | | | | | | | | | | | to non-existent ref Closes #17537
* | | Merge branch 'rs-issue-3055' into 'master' Douwe Maan2016-05-201-0/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Use extended regexp flag for `git grep`-ing files Closes #3055 See merge request !4203
| * | Use extended regexp flag for `git grep`-ing filesrs-issue-3055Robert Speicher2016-05-181-0/+6
| | | | | | | | | | | | Closes #3055
* | | Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-192-12/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
| * | | Add method that check if build has tagsGrzegorz Bizon2016-05-191-0/+12
| | | |
| * | | Extend CI runners specsGrzegorz Bizon2016-05-191-1/+31
| | | |
| * | | Disallow runner to pick untagged build if configuredGrzegorz Bizon2016-05-191-11/+27
| |/ /
* | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-191-1/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
| * | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-166-82/+124
| |\ \
| * | | Remove testing delegateKamil Trzcinski2016-05-141-1/+0
| | | |
| * | | Revert `stages` changeKamil Trzcinski2016-05-141-0/+12
| | | |
| * | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-1340-681/+71
| |\ \ \
| * | | | Fix specsKamil Trzcinski2016-05-131-12/+0
| | | | |
| * | | | Improve pipelines designKamil Trzcinski2016-05-101-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-0924-306/+683
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/ci/builds/_build.html.haml # app/views/projects/commit/_ci_commit.html.haml # app/views/projects/commit/_commit_box.html.haml
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-04-2619-159/+1064
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ci-commit-as-pipeline' into with-pipeline-viewKamil Trzcinski2016-04-132-0/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ci-commit-as-pipeline: (131 commits) Optimise Merge Request builds rendering Fix migrations on MySQL Update db/schema.rb Cleanup changes Cleanup required migrations Add indexes concurrently on PostgreSQL Fix CiStatus implementation and tests Fix group_member_spec to not leak information Fix doc for moving an issue Update tests for moving issues via API Tie example config to JIRA screenshot API: Ability to move an issue Added ability to add custom tags to transactions API: Avoid group leak while updating the group API: Return 404 if user does not have access to group Move 'New branch from issue' feature doc to web_editor.md Fix repository cache invalidation issue when project is recreated with an empty repo improve formatting Add `Gitlab.com?` method (doc) fix typo to ssh keys doc url ... Conflicts: app/controllers/projects/pipelines_controller.rb app/helpers/ci_status_helper.rb app/helpers/gitlab_routing_helper.rb app/views/projects/ci/commits/_commit.html.haml app/views/projects/commit/_ci_commit.html.haml
| * | | | | | | Make Pipeline view workKamil Trzcinski2016-04-131-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'docker-registry-view' into 'master' Kamil Trzciński2016-05-182-2/+94
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add container registry support Tasks: - [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787 - [x] Implement Docker Registry API - [x] Show a list of docker images in GitLab - [x] Remove registry repository on project deletion - [x] Support project rename, move and namespace rename - [x] Use token when connecting the registry - [x] Allow to delete images from GitLab - [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN) - [x] Support GitLab Runner pulling for public repositories - [ ] Support GitLab Runner pulling for private repositories - [x] Add tests for Docker Registry API - [x] Add tests for a views - [x] Make texts nicer - [x] Implement a backup support - [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141 - [ ] Create user documentation See merge request !4040
| * | | | | | | | Fix specsKamil Trzcinski2016-05-161-0/+2
| | | | | | | | |
| * | | | | | | | Use container registry config stubKamil Trzcinski2016-05-161-13/+3
| | | | | | | | |
| * | | | | | | | Improve test coverageKamil Trzcinski2016-05-162-4/+29
| | | | | | | | |
| * | | | | | | | Test container related specsKamil Trzcinski2016-05-161-0/+75
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Improve issue formatting in Slack serviceJeroen van Baarsen2016-05-181-5/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | | Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-161-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * | | | | | | Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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 ↵Douwe Maan2016-05-161-0/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-161-0/+31
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-161-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-2/+13
| |/ / / / /
* | | | | | Update specsDouwe Maan2016-05-131-75/+1
| | | | | |
* | | | | | 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-134-15/+15
| | | | |
* | | | | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-121-0/+10
| | | | | | | | | | | | | | | | | | | | Closes #15638
* | | | | stub Devise.omniauth_providers to return GitHub even if the gitlab.yml has ↵Andrei Gliga2016-05-121-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no omniauth provider enabled This will fix failing tests in case gitlab.yml file has no omniauth providers enabled
* | | | | validate disabled_oauth_sign_in_sources in ApplicationSeAndrei Gliga2016-05-121-0/+3
| | | | |
* | | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
| * | | | | Fix test failuresJacob Vosmaer2016-05-091-2/+2
| | | | | |
* | | | | | Tidy up user project specsSean McGivern2016-05-111-13/+8
| | | | | |
* | | | | | Restrict starred projects to viewable onesSean McGivern2016-05-101-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects.
* | | | | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-101-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'wiki-fix' into 'master'" This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817 (!4026), reversing changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34. From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4026#note_11719950: > 1. On Ruby 2.1.x, the [`uri.path = ::File.join(project_wiki_base_path, uri.path)`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L39) raises an `URI::InvalidComponentError: bad component(expected relative path component): http://bar.com/baz` error in `Banzai::Filter::WikiLinkFilter#rebuild_wiki_uri`, which is then rescued in [`Banzai::Filter::WikiLinkFilter#process_link_attr`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L34), thus the link is not modified and the tests pass. 1. On Ruby 2.2.x, the same line doesn't raise an error anymore, thus tests are broken on Ruby 2.2 only. I didn't really understand yet why having absolute links in the wiki would break some tests vs having relative links as before, but I think the safest course to action is to revert this MR and to find another fix (probably just prepending `ProjectWiki#wiki_base_path` with the relative URL path component if we are in the case of a relative URL... /cc @artem-sidorenko Just a FYI note: no need to pick into `8-7-stable` since the original commit was not picked. See merge request !4105
| * | | | | | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817, reversing changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34. Signed-off-by: Rémy Coutable <remy@rymai.me>