summaryrefslogtreecommitdiff
path: root/spec/services/merge_requests
Commit message (Collapse)AuthorAgeFilesLines
* Make guests unable to view MRsguests_cant_see_mrsValery Sizov2016-10-111-0/+6
|
* Merge branch 'empty-mrs' into 'master' Rémy Coutable2016-10-111-2/+18
|\ | | | | | | | | | | | | Allows empty merge requests for a workflow described in gitlab-org/gitlab-ce#14606 Closes gitlab-org/gitlab-ce#14606 See merge request !6384
| * Allow empty merge requestsArtem Sidorenko2016-10-111-2/+18
| |
* | Improve spec for merge when build succeeds featureGrzegorz Bizon2016-10-081-5/+19
|/
* Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-071-1/+4
| | | | | | | | | | | | This commit adds a number of _html columns and, with the exception of Note, starts updating them whenever the content of their partner fields changes. Note has a collision with the note_html attr_accessor; that will be fixed later A background worker for clearing these cache columns is also introduced - use `rake cache:clear` to set it off. You can clear the database or Redis caches separately by running `rake cache:clear:db` or `rake cache:clear:redis`, respectively.
* Fix bug when trying to cache closed issues from external issue trackersissue_22446Felipe Artur2016-10-031-0/+36
|
* Close todos when accepting a MR via the API.Tony Gambone2016-09-292-6/+30
|
* Add a spec for merge request metric caching while refreshing a merge request ↵Timothy Andrew2016-09-213-11/+37
| | | | from a forked project.
* Use the `IssuableBaseService` lifecycle hooks to cache ↵Timothy Andrew2016-09-213-5/+5
| | | | | | | `MergeRequestsClosingIssues` - Instead of overriding `create` and `update` in `MergeRequests::BaseService` - Get all merge request service specs passing
* Implement a second round of review comments from @DouweM.Timothy Andrew2016-09-213-5/+5
| | | | | | | | | | | | | | - Don't use `TableReferences` - using `.arel_table` is shorter! - Move some database-related code to `Gitlab::Database` - Remove the `MergeRequest#issues_closed` and `Issue#closed_by_merge_requests` associations. They were either shadowing or were too similar to existing methods. They are not being used anywhere, so it's better to remove them to reduce confusion. - Use Rails 3-style validations - Index for `MergeRequest::Metrics#first_deployed_to_production_at` - Only include `CycleAnalyticsHelpers::TestGeneration` for specs that need it. - Other minor refactorings.
* Fix rubocop spec.Timothy Andrew2016-09-201-1/+1
| | | | And `scss_lint`
* Test all cycle analytics pre-calculation code.Timothy Andrew2016-09-193-0/+92
| | | | | | | | | | | | | All the code that pre-calculates metrics for use in the cycle analytics page. - Ci::Pipeline -> build start/finish - Ci::Pipeline#merge_requests - Issue -> record default metrics after save - MergeRequest -> record default metrics after save - Deployment -> Update "first_deployed_to_production_at" for MR metrics - Git Push -> Update "first commit mention" for issue metrics - Merge request create/update/refresh -> Update "merge requests closing issues"
* Prepend blank line to close message on merge requestLuke Howell2016-09-011-2/+2
| | | | | | - Added an extra new line to the prepend of the Close message Fixes #21710
* Project tools visibility levelFelipe Artur2016-09-011-1/+1
|
* Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-uiSean McGivern2016-08-301-0/+87
| | | | | | Forks may not be up-to-date with the target project, and so might not contain one of the parent refs in their repo. Fetch this if it isn't present.
* Fix merge request diff cache service specDmitriy Zaporozhets2016-08-221-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-191-0/+46
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022
| * Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-181-0/+5
| |\
| * \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-161-0/+34
| |\ \
| * | | Address review feedbackDouwe Maan2016-08-161-1/+1
| | | |
| * | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-129-22/+117
| |\ \ \
| * | | | Add specs for system note and email when all discussions are resolvedDouwe Maan2016-08-121-0/+46
| | | | |
* | | | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-183-5/+41
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Support slash commands in issues / MR description & comments See merge request !5021
| * | | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-161-0/+34
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | # Conflicts: # app/services/issues/create_service.rb
| * | | | Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service`Rémy Coutable2016-08-132-4/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Support slash commands in noteable description and notesRémy Coutable2016-08-131-1/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some important things to note: - commands are removed from noteable.description / note.note - commands are translated to params so that they are treated as normal params in noteable Creation services - the logic is not in the models but in the Creation services, which is the right place for advanced logic that has nothing to do with what models should be responsible of! - UI/JS needs to be updated to handle notes which consist of commands only - the `/merge` command is not handled yet Other improvements: - Don't process commands in commit notes and display a flash is note is only commands - Add autocomplete for slash commands - Add description and params to slash command DSL methods - Ensure replying by email with a commands-only note works - Use :subscription_event instead of calling noteable.subscribe - Support :todo_event in IssuableBaseService Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | DRY up the added update service specs, add two email helpersNick Thomas2016-08-161-31/+3
| | | |
* | | | Address minor review comments for testsNick Thomas2016-08-161-4/+4
| | | |
* | | | Add notifications for new user mentions in merge requestsNick Thomas2016-08-151-0/+33
| |/ / |/| |
* | | Don't show new MR URL after push when it doesn't make senseDouwe Maan2016-08-121-0/+34
|/ /
* | api for generating new merge requestScott Le2016-08-111-0/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DRY code + fix rubocop Add more test cases Append to changelog DRY changes list find_url service for merge_requests use GET for getting merge request links remove files rename to get_url_service reduce loop add test case for cross project refactor tiny thing update changelog
* | Pre-create all builds for Pipeline when a trigger is receivedKamil Trzcinski2016-08-111-7/+3
| | | | | | | | | | | | | | | | | | | | | | This change simplifies a Pipeline processing by introducing a special new status: created. This status is used for all builds that are created for a pipeline. We are then processing next stages and queueing some of the builds (created -> pending) or skipping them (created -> skipped). This makes it possible to simplify and solve a few ordering problems with how previously builds were scheduled. This also allows us to visualise a full pipeline (with created builds). This also removes an after_touch used for updating a pipeline state parameters. Right now in various places we explicitly call a reload_status! on pipeline to force it to be updated and saved.
* | adds second batch of tests changed to active tenseactive-tense-test-coveragetiagonbotelho2016-08-096-14/+14
| |
* | remove offending empty linewinniehell2016-08-091-1/+0
|/
* switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-031-2/+2
| | | | So we have raw_diffs too
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-4/+4
| | | This object will manage Gitlab::Git::Compare instances
* Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-031-0/+18
| | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
* webhooks: include old revision in MR update eventsBen Boeckel2016-08-011-3/+3
|
* Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-291-0/+11
| | | | | | | | | | | If somehow a user attempted to accept a merge request that had conflicts (e.g. the "Accept Merge Request" button or the MR itself was not updated), `MergeService` did not properly detect that a conflict occurred. It would assume that the MR went through without any issues and close the MR as though everything was fine. This could cause data loss if the source branch were removed. Closes #20425
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-2/+1
| | | | | | | | This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+2
| | | | | This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing changes made to fb229bbf7970ba908962b837b270adf56f14098f.
* Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-131-2/+1
| | | | | | | | | | | | | | 1. When a merge request is being merged, save the merge commit SHA in the `in_progress_merge_commit_sha` database column. 2. The `pre-receive` hook looks for any locked (in progress) merge request with `in_progress_merge_commit_sha` matching the `newrev` it is passed. 3. If it finds a matching MR, the merge is legitimate. 4. Update `git_access_spec` to test the behaviour we added here. Also refactored this spec a bit to make it easier to add more contexts / conditions.
* Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-125-5/+5
|
* Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-0/+10
|
* Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-1/+0
|
* Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-032-2/+2
|
* Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-032-20/+20
|
* Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-031-2/+2
|
* Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-031-2/+2
|
* Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-1/+1
|
View Lorry Controller Status