summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-5/+22
|\ | | | | | | | | | | | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
| * Use a similar approach to branch creation for tag creationuse-rugged-to-create-tagRémy Coutable2016-05-041-10/+24
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-041-4/+7
| | | | | | | | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-041-1/+1
|\ \ | |/ |/| | | | | # Conflicts: # Gemfile.lock
| * API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-291-1/+1
| | | | | | - Parameter validation as ISO8601 format
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-0219-209/+443
|\ \
| * | Ensure URL in all Service subclasses are validRémy Coutable2016-04-2519-209/+443
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Backported minimal safewebhook implementation to GitLab CEGabriel Mazetto2016-04-301-16/+30
| | |
* | | Use a query in Project#protected_branch?Yorick Peterse2016-04-291-0/+14
| | | | | | | | | | | | | | | | | | This changes Project#protected_branch? to use a query to check if a branch is protected, instead of loading all ProtectedBranch records into memory just to check if the list of names includes a given branch name.
* | | Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-291-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
* | | Reorder asserts is ci commits specs for consistencyGrzegorz Bizon2016-04-281-1/+1
| | |
* | | Add tests exercising builds scheduler after cancelGrzegorz Bizon2016-04-281-0/+18
| | |
* | | Refactor ci commit specs by adding context blocksGrzegorz Bizon2016-04-281-77/+85
| | |
* | | Render canceled status if any of the jobs canceledGrzegorz Bizon2016-04-271-0/+26
| |/ |/| | | | | | | This status will be returned only when there are no failed jobs that are not allowed to fail.
* | Allow alternative names for the CHANGELOG file.Connor Shea2016-04-261-1/+37
| | | | | | | | | | | | | | | | "CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864.
* | Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_atRémy Coutable2016-04-251-22/+43
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix Error 500 due to stale cache when projects are renamed or transferredStan Hu2016-04-251-5/+2
| | | | Closes gitlab-org/gitlab-ee#506
* Fix license detection to detect all license files, not only known licensesRémy Coutable2016-04-251-31/+15
| | | | | | Fixes #15470. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-211-0/+30
|\ | | | | | | | | | | | | Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
| * refactored specs based on feedbackfix/label-filtersJames Lopez2016-04-211-27/+18
| |
| * refactored specs, adding more scenariosJames Lopez2016-04-211-4/+19
| |
| * 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
View Lorry Controller Status