summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-26/+0
|
* Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-1/+142
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not halt the GitHub import process when an error occurs ## What are the relevant issue numbers? Fixes #20385 https://gitlab.com/gitlab-org/gitlab-ce/issues/20149 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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 !5763
| * Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-241-10/+13
| |
| * Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-1/+139
| |
* | Add failing test for #21334winniehell2016-08-241-0/+10
|/
* Merge branch 'metrics-typo' into 'master' Yorick Peterse2016-08-221-1/+1
|\ | | | | | | | | Fix typo in gitlab-workhorse header See merge request !5891
| * Fix typo in gitlab-workhorse headerJacob Vosmaer2016-08-191-1/+1
| |
* | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+1
| |
* | Merge branch 'directory-names-containing-space' into 'master' Robert Speicher2016-08-191-11/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not escape URI when extracting path ## What does this MR do? - remove escaping of URI parameters after they have already been unescaped in `ExtractsPath` - remove spec that is relying on that behavior ## Why was this MR needed? - spaces in directory names were escaped leading to 404 errors on repository files page ## What are the relevant issue numbers? fixes gitlab-com/support-forum#952, #21106 See merge request !5878
| * | Do not escape URI when extracting path (!5878)winniehell2016-08-191-11/+0
| | |
| * | Add failing test for gitlab-com/support-forum#952winniehell2016-08-191-0/+10
| | |
* | | Merge branch '20895-inline-comments-for-first-commit' into 'master' Douwe Maan2016-08-191-0/+42
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line commenting for the initial commit ## What does this MR do? Support line positions on the initial commit, where we can't compare because there's no parent commit. ## Are there points in the code the reviewer needs to double check? I chose to use the blank SHA to represent the initial commit, but it could as easily be the same SHA. I just thought this was clearer. ## Why was this MR needed? People couldn't add line comments to the initial commit! ## What are the relevant issue numbers? Closes #20895. ## Screenshots (if relevant) ![Comment_on_initial_commit](/uploads/1164448462ff55d133f3ff51c98044df/Comment_on_initial_commit.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added (N/A, regression) - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) (N/A) - [x] API support added (N/A) - 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 !5900
| * | Fix line commenting for the initial commitSean McGivern2016-08-191-0/+42
| | | | | | | | | | | | | | | The initial commit doesn't have a parent, so explicitly pass the blank SHA and handle that when calculating the position.
* | | Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' Douwe Maan2016-08-191-27/+40
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render coverage badge using latest successful pipeline ## What does this MR do? This MR make test coverage badge to report value for the latest successful pipeline, instead of the latest one, regardless the status. Latest pipeline is often running, which makes coverage report inaccurate. Latest pipeline can be also the failed one, which may mean that not all stages got processed, therefore coverage report can be inaccurate as well. This also improves coverage badge performance because it is not necessary to touch repository to get recent SHA on the branch. ## Why was this MR needed? See #21013 ## What are the relevant issue numbers? Closes #21013 ## 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) - 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 !5862
| * | Render coverage badge for latest successful pipelineGrzegorz Bizon2016-08-181-27/+40
| |/
* | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-184-0/+526
|\ \ | |/ |/| | | | | | | Support slash commands in issues / MR description & comments See merge request !5021
| * Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-182-29/+48
| |
| * Remove unneeded aliasesDouwe Maan2016-08-181-8/+8
| |
| * Fix specs and implement fixes based on failing specsDouwe Maan2016-08-171-49/+15
| |
| * Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1618-99/+677
| |\ | | | | | | | | | | | | # Conflicts: # app/services/issues/create_service.rb
| * | Fixed specs and fixes based on failing specsDouwe Maan2016-08-163-176/+222
| | |
| * | Refactor slash command definitionDouwe Maan2016-08-121-15/+15
| | |
| * | Simplify the slash commands DSL to store action blocks instead of creating ↵Rémy Coutable2016-08-132-55/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods Other improvements: - Ensure slash commands autocomplete doesn't break when noteable_type is not given - Slash commands: improve autocomplete behavior and /due command - We don't display slash commands for note edit forms. - Add tests for reply by email with slash commands - Be sure to execute slash commands after the note creation in Notes::CreateService Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | New TodoService#todo_exists? methodRémy Coutable2016-08-131-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Accept blocks for `.desc` and `.condition` slash commands DSLRémy Coutable2016-08-131-19/+42
| | | | | | | | | | | | | | | | | | | | | Also, pass options as instance variables, making the DSL more user-friendly / natural. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Make slash commands contextualRémy Coutable2016-08-131-15/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Return only slash commands that make sense for the current noteable - Allow slash commands decription to be dynamic Other improvements: - Add permission checks in slash commands definition - Use IssuesFinder and MergeRequestsFinder - Use next if instead of a unless block, and use splat operator instead of flatten Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-132-7/+13
| | | | | | | | | | | | | | | | | | The first one is /cc Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Don't extract slash commands inside blockcode, blockquote or HTML tagsRémy Coutable2016-08-131-0/+27
| | | | | | | | | | | | | | | | | | Improve slash command descriptions, support /due tomorrow Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Add the /title slash commandRémy Coutable2016-08-131-2/+13
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Support slash commands in noteable description and notesRémy Coutable2016-08-133-0/+296
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'custom-events-tracking' into 'master' Douwe Maan2016-08-175-2/+130
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracking of custom events ## What does this MR do? This MR adds the ability to track custom events such as the number of Git pushes. ## Are there points in the code the reviewer needs to double check? The usual stuff. ## Why was this MR needed? We want to track more business level data such as the number of Git pushes, how many repositories are imported (and from where), etc. ## What are the relevant issue numbers? gitlab-org/gitlab-ce#13720 ## 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) cc @pcarranza See merge request !5830
| * | | Tracking of custom eventscustom-events-trackingYorick Peterse2016-08-175-2/+130
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab Performance Monitoring is now able to track custom events not directly related to application performance. These events include the number of tags pushed, repositories created, builds registered, etc. The use of these events is to get a better overview of how a GitLab instance is used and how that may affect performance. For example, a large number of Git pushes may have a negative impact on the underlying storage engine. Events are stored in the "events" measurement and are not prefixed with "rails_" or "sidekiq_", this makes it easier to query events with the same name triggered from different parts of the application. All events being stored in the same measurement also makes it easier to downsample data. Currently the following events are tracked: * Creating repositories * Removing repositories * Changing the default branch of a repository * Pushing a new tag * Removing an existing tag * Pushing a commit (along with the branch being pushed to) * Pushing a new branch * Removing an existing branch * Importing a repository (along with the URL we're importing) * Forking a repository (along with the source/target path) * CI builds registered (and when no build could be found) * CI builds being updated * Rails and Sidekiq exceptions Fixes gitlab-org/gitlab-ce#13720
* | | Merge remote-tracking branch 'origin/master' into mc-uiSean McGivern2016-08-1711-45/+288
|\ \ \
| * | | Better formatting for downtime check messagesfix-downtime-check-formattingYorick Peterse2016-08-171-1/+23
| | | | | | | | | | | | | | | | | | | | This removes excessive whitespace from the messages (e.g. leading whitespace) and ensures the message is more clearly visible.
| * | | Fixed downtime check label colouringYorick Peterse2016-08-171-2/+2
| |/ / | | | | | | | | | | | | The colours were incorrect: offline was green and online was red, instead of the opposite.
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-166-38/+223
| |\ \ | | | | | | | | | | | | pipeline-hooks-without-slack
| | * | Load issues and merge requests templates from repositoryFelipe Artur2016-08-164-2/+221
| | | |
| | * | Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-1/+2
| | |\ \
| | | * \ Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-151-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-1/+2
| | | | | |
| | * | | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-151-35/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submit to Akismet Part 1 (Issues) Related to #5932 #5573 gitlab-com/infrastructure#14 See merge request !5538
| | | * | | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored SpamCheckService into SpamService
| | | * | | | Refactored spam related code even furtherPatricio Cano2016-08-151-11/+0
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed unnecessary column from `SpamLog` - Moved creation of SpamLogs out of its own service and into SpamCheckService - Simplified code in SpamCheckService. - Moved move spam related code into Spammable concern
| * | | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-157-56/+314
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-0/+99
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-122-8/+39
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb # app/models/commit_status.rb # app/services/ci/create_pipeline_service.rb # spec/models/ci/pipeline_spec.rb
| * | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
| * | | | | 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.
| * | | | | Enhance a pipeline event tests to analyse number of returned buildsKamil Trzcinski2016-08-111-2/+6
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-114-13/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb # app/services/ci/create_pipeline_service.rb # spec/models/project_services/hipchat_service_spec.rb