summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filtersJames Lopez2016-04-217-21/+221
| |\ | | | | | | | | | | | | # Conflicts: # spec/features/issues/filter_by_labels_spec.rb
| * | final line missingJames Lopez2016-04-201-1/+1
| | |
| * | fix rubocop warningJames Lopez2016-04-201-2/+2
| | |
| * | udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-201-1/+25
| | |
* | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-216-129/+280
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-193-1/+55
| |\ \ | | |/ | | | | | | | | | # Conflicts: # db/schema.rb
| * | Fix rubocopKamil Trzcinski2016-04-181-1/+1
| | |
| * | Fix testsKamil Trzcinski2016-04-182-25/+26
| | |
| * | Write specs for this featureKamil Trzcinski2016-04-163-1/+159
| | |
| * | Rename CiStatus to StatusableKamil Trzcinski2016-04-162-0/+111
| | |
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-165-115/+464
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-132-0/+19
| |\ \ \
| * | | | Fix specsKamil Trzcinski2016-04-114-130/+11
| | | | |
* | | | | Merge branch 'slack_wiki_notifications' into 'master' Rémy Coutable2016-04-202-0/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add slack notifications for wiki pages ## What does this MR do? Lets the Slack service be configured to send notifications when wiki pages are created or edited. ## Are there points in the code the reviewer needs to double check? I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :) ## Why was this MR needed? Related to #563 and fixes #4233. See merge request !2998
| * | | | | Fix test to conform to conventionsSebastian Klier2016-04-201-7/+8
| | | | | |
| * | | | | Fix testSebastian Klier2016-04-201-4/+4
| | | | | |
| * | | | | formatting and test structureSebastian Klier2016-04-201-26/+43
| | | | | |
| * | | | | add slack notifications for wiki pagesSebastian Klier2016-04-202-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | update changelog
* | | | | | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-201-9/+56
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
| * | | | | Continue implementation of the license template selector and /licenses API ↵Rémy Coutable2016-04-181-9/+56
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | endpoint Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | 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>
View Lorry Controller Status