summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-0/+35
|\
| * Add support to cherry-pick any commitP.S.V.R2016-04-181-0/+35
| | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* | Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-193-5/+5
|\ \ | | | | | | | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
| * | format merge request references properlyBen Bodenmiller2016-04-183-5/+5
| | |
* | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-191-7/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize branch names for confidential issues - When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`. - The behaviour for non-confidential issues stays the same. Closes #14566 See merge request !3671
| * | | A new branch created for a confidential issue is named ↵14566-confidential-issue-branchesTimothy Andrew2016-04-191-1/+1
| | | | | | | | | | | | | | | | `<id>-confidential-issue`.
| * | | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-155-112/+459
| |\ \ \ | | | | | | | | | | | | | | | 14566-confidential-issue-branches
| * | | | Make a few style changes based on MR feedback.Timothy Andrew2016-04-151-2/+2
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-131-0/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 14566-confidential-issue-branches
| * | | | | Fix the rubocop check.Timothy Andrew2016-04-131-2/+3
| | | | | |
| * | | | | Test the `Issue#to_branch_name` method.Timothy Andrew2016-04-121-2/+11
| | | | | |
| * | | | | Augment the tests for `Issue#related_branches`Timothy Andrew2016-04-121-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Test the case where we have a referenced merge request that's being - excluded as a "related branch" - This took a while to figure out, especially the `create_cross_references!` line.
| * | | | | Refactor `Issue#related_branches`Timothy Andrew2016-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, the controller held the logic to calculate related branches, which was: `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>` - This logic belongs in the `related_branches` method, not in the controller. This commit makes this change. - This means that `Issue#related_branches` now needs to take a `User`. When we find the branches that have a merge request referenced in the current issue, this is limited to merge requests that the current user has access to. - This is not directly related to #14566, but is a related refactoring.
* | | | | | Remove code that removes duplicate CI variablesGrzegorz Bizon2016-04-181-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point this is being handled by GitLab Runner and we need to introduce this as a separate merge request.
* | | | | | Improve build specs for job environment variablesGrzegorz Bizon2016-04-181-2/+5
| | | | | |
* | | | | | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-13/+9
| | | | | |
* | | | | | Make it possible to override build variablesGrzegorz Bizon2016-04-181-5/+19
| | | | | |
* | | | | | Add `variables` keyword to job in CI config YAMLGrzegorz Bizon2016-04-181-0/+16
| | | | | |
* | | | | | Instrument Repository.clean_old_archivesYorick Peterse2016-04-181-1/+24
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into number_sign_for_external_issue_refBaldinoF2016-04-1714-181/+701
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Delete tags via ruggedRobert Schilling2016-04-151-4/+2
| | | | |
| * | | | Merge branch 'rs-trailing-slash-in-search' into 'master' Douwe Maan2016-04-151-0/+6
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Escape the query argument provided to `git grep` by `search_files` Closes #14963. See merge request !3633
| | * | | Escape the query argument provided to `git grep` by `search_files`rs-trailing-slash-in-searchRobert Speicher2016-04-091-0/+6
| | |/ / | | | | | | | | | | | | Closes #14963.
| * | | Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-141-5/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
| | * | | Start with iid on branch creationZeger-Jan van de Weg2016-04-141-5/+12
| | | | |
| * | | | Allow empty recipient list when pusher is addedFrank Groeneveld2016-04-141-2/+35
| |/ / / | | | | | | | | | | | | Closes #13574
| * | | Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-131-52/+210
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug with trailing slash in bamboo_url Also, improve specs for BambooService Similar to !3679. See merge request !3680
| | * | | Fix a bug with trailing slash in bamboo_urlRémy Coutable2016-04-131-52/+210
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, improve specs for BambooService Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515 Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' Robert Speicher2016-04-131-52/+199
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix trailing slash in teamcity_url Originally opened at !2309 by @ctmay4. As described in #3515, if you have trailing spaces in the the Teamcity server name, the service will not work properly. Switching from `URI.parse` to `URI.join` fixes it so that it works with or without a trailing slash. Fixes #3515. See merge request !3679
| | * | | Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515Rémy Coutable2016-04-131-52/+199
| | |/ / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Fix repository cache invalidation issue when project is recreated with an ↵Stan Hu2016-04-131-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty repo To reproduce: 1. Create a project with some content 2. Rename the project 3. Create a new project with the same name. 4. Boom - 404. After step 2, the branch and tag counts were not being cleared. This would cause `repository.has_visible_content?` to erroneously return `true` for the newly-created project. Closes #13384
| * | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-087-35/+115
| |\ \ | | |/
| | * Expire caches after project creation to ensure a consistent stateStan Hu2016-04-071-0/+13
| | | | | | | | | | | | Closes #14961
| | * Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable2016-04-061-2/+22
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-041-0/+14
| | | | | | | | | | | | | | | GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
| | * Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-011-4/+21
| | | | | | | | | | | | | | | This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
| | * Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into ↵Rémy Coutable2016-04-011-0/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow temp-oauth-email as notification email Closes #14559 /cc @dblessing @rymai See merge request !3477
| | | * Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-311-0/+7
| | | |
| | * | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
| | * | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-311-0/+9
| | |/
| | * Merge branch 'fix-todos' into 'master' Rémy Coutable2016-03-311-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
| | | * Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-301-0/+1
| | | |
| | * | Merge branch 'reorder-project-expire-cache' into 'master' Yorick Peterse2016-03-301-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Expire the exists cache before deletion to ensure project dir actually exists See merge request !3413
| | | * | Expire the exists cache before deletion to ensure project dir actually existsStan Hu2016-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #14659
| | * | | minor cleanup in system_hook_specZeger-Jan van de Weg2016-03-301-27/+27
| | | |/ | | |/|
| * | | Add spec for user_id uniq in NotificationSetting modelDmitriy Zaporozhets2016-03-301-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-301-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-301-0/+15
| |/ / | | | | | | | | | | | | | | | | | | It will hold notification setting per group or per project. It will allow get rid of notification level stored in Member model Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-291-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| | * | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-4/+4
| | |/ | | | | | | | | | Fixes #14692
View Lorry Controller Status