summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-182-29/+48
|
* Remove unneeded aliasesDouwe Maan2016-08-186-83/+68
|
* Fix specs and implement fixes based on failing specsDouwe Maan2016-08-172-51/+17
|
* Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1677-361/+1831
|\ | | | | | | | | # Conflicts: # app/services/issues/create_service.rb
| * Merge branch 'pipeline-hooks-without-slack' into 'master' Robert Speicher2016-08-1623-69/+227
| |\ | | | | | | | | | | | | | | | | | | Implement pipeline hooks, extracted from !5525 Closes #20115 See merge request !5620
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-1624-137/+745
| | |\ | | | | | | | | | | | | pipeline-hooks-without-slack
| | * | Revert unrelevant changespipeline-hooks-without-slackKamil Trzcinski2016-08-162-20/+15
| | | |
| | * | Make rubocop happyKamil Trzcinski2016-08-151-9/+9
| | | |
| | * | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1512-84/+436
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1519-75/+427
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-136-24/+114
| | |\ \ \ \
| | * | | | | Make explicit call for all event types for ProjectHook factoryKamil Trzcinski2016-08-121-9/+7
| | | | | | |
| | * | | | | Rename queue to enqueue in testsKamil Trzcinski2016-08-121-6/+6
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-122-6/+23
| | |\ \ \ \ \
| | * | | | | | Fix test failuresKamil Trzcinski2016-08-121-1/+1
| | | | | | | |
| | * | | | | | Make pipeline to be in created state for hooks testsKamil Trzcinski2016-08-121-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1210-115/+235
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb # app/models/commit_status.rb # app/services/ci/create_pipeline_service.rb # spec/models/ci/pipeline_spec.rb
| | * | | | | | | Have trait all_events_enabled so that's easier to reuse, feedback:Lin Jen-Shin2016-08-122-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13823349
| | * | | | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-1218-39/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
| | * | | | | | | Make it more grammatically correct, feedback:Lin Jen-Shin2016-08-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13811203
| | * | | | | | | if -> when; when -> `when`; %w() -> %w[]; and fix some typos:Lin Jen-Shin2016-08-121-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810945
| | * | | | | | | Prefer described_class, feedback:Lin Jen-Shin2016-08-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810811 And other similar places.
| | * | | | | | | Make the comment more clear, feedback:Lin Jen-Shin2016-08-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810778
| | * | | | | | | Fix tests for pipeline eventsKamil Trzcinski2016-08-111-17/+47
| | | | | | | | |
| | * | | | | | | Fix pipeline status change from pending to runningKamil Trzcinski2016-08-111-0/+45
| | | | | | | | |
| | * | | | | | | Enhance a pipeline event tests to analyse number of returned buildsKamil Trzcinski2016-08-112-22/+25
| | | | | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1137-1085/+1481
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb # app/services/ci/create_pipeline_service.rb # spec/models/project_services/hipchat_service_spec.rb
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-11248-1996/+3147
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (233 commits) Fix awardable button mutuality loading spinners Update CHANGELOG for 8.10.5 Clean up project destruction Small refactor of doc/development/README.md Avoid commit lookup on diff_helper Removed extra newline from redis_spec.rb Used cached value of project count to reduce DB load Remove duplicate link_to statements Mention add_column_with_default in downtime guide Add missing space to generic badge template Rename `run` task helper method to prevent conflict with StateMachine Add a method in Project to return a cached value of total count of projects spellcheck Add svg guidelines to ui guide Add Changelog entry for Grape upgrade [ci skip] Fix Grape tests. Retain old behavior Update Grape from 0.13.0 to 0.15.0. adds second batch of tests changed to active tense fixes part1 of files to start using active tense ...
| | * | | | | | | | | Let's make sure cache were cleared:Lin Jen-Shin2016-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't reproduce this failure locally. Here's the failure: https://gitlab.com/gitlab-org/gitlab-ce/builds/2864250
| | * | | | | | | | | Define utility functions later, feedback:Lin Jen-Shin2016-08-051-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13581143
| | * | | | | | | | | Removed the abstract let, feedback:Lin Jen-Shin2016-08-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13580861
| | * | | | | | | | | Missed renaming themLin Jen-Shin2016-08-051-5/+7
| | | | | | | | | | |
| | * | | | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-0416-26/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13540099
| | * | | | | | | | | If we use Rails magic it's breaking this test:Lin Jen-Shin2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/lib/gitlab/data_builder/pipeline_data_builder_spec.rb Because it would trigger the event just after saved and it would load no builds and cache it. We should really avoid adding more magic.
| | * | | | | | | | | I was too used to this style...Lin Jen-Shin2016-08-041-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Test against the status in the payloadLin Jen-Shin2016-08-031-1/+9
| | | | | | | | | | |
| | * | | | | | | | | Make sure we only fire hooks upon status changedLin Jen-Shin2016-08-031-1/+21
| | | | | | | | | | |
| | * | | | | | | | | Use when instead of if, feedback:Lin Jen-Shin2016-08-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620/diffs#note_13540211
| | * | | | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-024-6/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20115
| * | | | | | | | | | Merge branch 'file-content-highlight-line' into 'master' Jacob Schatz2016-08-162-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight empty lines ## What does this MR do? Rather than just highlight the text, file line highlighting now highlights the full line including empty lines ## What are the relevant issue numbers? Closes #19484 ## Screenshots (if relevant) ![Screen_Shot_2016-07-05_at_13.52.31](/uploads/d3bddc918d731681465381e96c0aa2b0/Screen_Shot_2016-07-05_at_13.52.31.png) See merge request !5092
| | * | | | | | | | | Highlight empty linesPhil Hughes2016-07-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19484
| * | | | | | | | | | Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-167-33/+392
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load issue templates from repository part of #18656 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4981
| | * | | | | | | | | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-167-33/+392
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-164-198/+66
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-163-39/+66
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-152-1/+6
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attribute inclusion import/export config ignored in some cases In the `import_export.yml` file we define the inclusion of some of the attributes. For some reason, this isn't working in certain cases - very unfortunate this includes `user`. This has been introduced in 8.10.3. Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20802 See merge request !1982
| | | | * | | | | | | | | | Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-112-1/+6
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-151-38/+60
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set permissions to admin for importing a project via Import/Export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20802 In order to import a project, it is now required to be an admin Moved from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5766 See merge request !1983
| | | | * | | | | | | | | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-111-38/+60
| | | | |/ / / / / / / / / /
| | * | | | | | | | | | | | Revert "Merge branch ↵Rubén Dávila Santos2016-08-161-159/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'" This reverts merge request !5417
View Lorry Controller Status