summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Annotate the modelsZeger-Jan van de Weg2016-05-0672-323/+485
|
* Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-041-3/+13
|\ | | | | | | | | | | | | | | | | 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-7/+10
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-041-2/+9
| | | | | | | | | | | | 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-2/+4
|\ \ | |/ |/| | | | | # Conflicts: # Gemfile.lock
| * API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-291-2/+4
| | | | | | - Parameter validation as ISO8601 format
* | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-1/+1
| | | | | | | | | | | | This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-024-4/+6
|\ \
| * | Ensure URL in all Service subclasses are validRémy Coutable2016-04-254-4/+6
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Support e-mail notifications for comments on project snippetsStan Hu2016-05-021-0/+2
| | | | | | | | | | | | Closes #2334
* | | Backported minimal safewebhook implementation to GitLab CEGabriel Mazetto2016-04-304-9/+18
| | |
* | | Tweak checking branches in Project#open_branchesYorick Peterse2016-04-291-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes 4 things: 1. Project#protected_branches_names has been renamed to Project#protected_branch_names. 2. Project#open_branches uses a Set for the branch names as checking values in a Set is faster than checking values in a (large) Array. 3. Some redundant code in Project#open_branches has been removed. 4. Project#protected_branch_names now uses #pluck instead of #map, removing the need for loading entire DB records into memory.
* | | Use a query in Project#protected_branch?Yorick Peterse2016-04-291-1/+1
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'gitattributes' into 'master' Rémy Coutable2016-04-292-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support supressing text file diffs on the default branch with .gitattributes This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch. When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed. ![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png) I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`. Fixes and closes gitlab-org/gitlab-ce#2315. See merge request !3806
| * | | Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-292-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Use a better message when milestone is newly createdchange_message_for_newly_created_milestoneArinde Eniola2016-04-291-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | make some changes for the checks to determine when the messages should be displayed add item to changelog and also integration test make some changes to the test make some changes
* | | Properly handle bigger filesZeger-Jan van de Weg2016-04-282-0/+12
| | |
* | | Render canceled status if any of the jobs canceledGrzegorz Bizon2016-04-271-1/+1
| |/ |/| | | | | | | 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/+1
| | | | | | | | | | | | | | | | "CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files. Also adds relevant tests for each of these names. Resolves #14864.
* | Remove the Devise Async gem.Connor Shea2016-04-261-1/+1
| | | | | | | | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* | Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_atRémy Coutable2016-04-251-1/+1
|/ | | | 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-4/+2
| | | | Closes gitlab-org/gitlab-ee#506
* Fix license detection to detect all license files, not only known licensesRémy Coutable2016-04-251-7/+3
| | | | | | Fixes #15470. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-211-1/+8
|\ | | | | | | | | | | | | Filter labels by including ALL filter titles Fixed query to use `AND` and not `OR`. Refactored relevant specs See merge request !3815
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filtersJames Lopez2016-04-2122-57/+232
| |\ | | | | | | | | | | | | # Conflicts: # spec/features/issues/filter_by_labels_spec.rb
| * | udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-201-1/+8
| | |
| * | filter labels by including all filter titles as part of the queryJames Lopez2016-04-191-1/+1
| | |
* | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-217-145/+173
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-199-26/+74
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | Fix testsKamil Trzcinski2016-04-181-1/+1
| | | |
| * | | Make some logic less twistableKamil Trzcinski2016-04-171-1/+1
| | | |
| * | | Write specs for this featureKamil Trzcinski2016-04-163-12/+16
| | | |
| * | | Rename CiStatus to StatusableKamil Trzcinski2016-04-164-6/+10
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1610-39/+112
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Fix implementation of config_processor and ci_yaml_fileKamil Trzcinski2016-04-131-10/+15
| | | | |
| * | | | Update handling of skipped statusKamil Trzcinski2016-04-133-17/+18
| | | | |
| * | | | Simplify state update of Ci::Commit objectKamil Trzcinski2016-04-131-61/+11
| | | | |
| * | | | Support skipped statusKamil Trzcinski2016-04-131-0/+3
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1312-111/+75
| |\ \ \ \
| * | | | | Fix CiStatus implementation and testsKamil Trzcinski2016-04-132-11/+11
| | | | | |
| * | | | | Remove the use of default scope for BuildsKamil Trzcinski2016-04-131-11/+0
| | | | | |
| * | | | | Optimise CI status accessorKamil Trzcinski2016-04-122-41/+22
| | | | | |
| * | | | | Optimise CI status accessorKamil Trzcinski2016-04-123-1/+41
| | | | | |
| * | | | | Fix create_next_builds methodKamil Trzcinski2016-04-121-3/+3
| | | | | |
| * | | | | Fix rest of rspec and spinach testsKamil Trzcinski2016-04-122-7/+9
| | | | | |
| * | | | | Fix specsKamil Trzcinski2016-04-113-14/+25
| | | | | |
| * | | | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-117-106/+144
| | | | | |
* | | | | | Move Issue scopes from Issuable to Issue modelRémy Coutable2016-04-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Move due_date sort scopes to Issue and fix CHANGELOGRémy Coutable2016-04-202-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Address MR feedbackRémy Coutable2016-04-203-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status