summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add expiration date to group membershipsSean McGivern2016-08-182-6/+9
|
* Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-18114-1485/+2318
|\
| * Merge branch 'custom-events-tracking' into 'master' Douwe Maan2016-08-176-4/+51
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-176-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1721-121/+362
| |\ \
| | * | Better formatting for downtime check messagesfix-downtime-check-formattingYorick Peterse2016-08-171-2/+13
| | | | | | | | | | | | | | | | | | | | 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-1615-109/+267
| | |\ | | | | | | | | | | | | pipeline-hooks-without-slack
| | | * Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-169-38/+241
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-169-38/+241
| | | | |
| | | * | Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changesTimothy Andrew2016-08-161-6/+3
| | | |\ \ | | | | |/
| | | | * Merge remote-tracking branch 'dev/master'Ruben Davila2016-08-161-6/+3
| | | | |\
| | | | | * Merge branch 'fix/export-att-inclusion' into 'master' Douwe Maan2016-08-151-6/+3
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | * refactor parse_hash based on feedbackJames Lopez2016-08-111-3/+3
| | | | | | |
| | | | | | * Fix attribute inclusion in import/export config ignored in some casesJames Lopez2016-08-111-6/+3
| | | | | | |
| | | * | | | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. `GitPushService` was still using `{merge,push}_access_level_attributes` instead of `{merge,push}_access_levels_attributes`. 2. The branches API creates access levels regardless of the state of the `developers_can_{push,merge}` parameters. This is in line with the UI, where Master access is the default for a new protected branch. 3. Use `after(:build)` to create access levels in the `protected_branches` factory, so that `factories_spec` passes. It only builds records, so we need to create access levels on `build` as well.
| | | * | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-162-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Change a few incorrect `access_level` to `access_levels.first` that were missed in e805a64. 2. `API::Entities` can iterate over all access levels instead of just the first one. This makes no difference to CE, and makes it more compatible with EE.
| | | * | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-2/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !581 has a lot of changes that would cause merge conflicts if not properly backported to CE. This commit/MR serves as a better foundation for gitlab-org/gitlab-ee!581. = Changes = 1. Move from `has_one {merge,push}_access_level` to `has_many`, with the `length` of the association limited to `1`. This is _effectively_ a `has_one` association, but should cause less conflicts with EE, which is set to `has_many`. This has a number of related changes in the views, specs, and factories. 2. Make `gon` variable loading more consistent (with EE!581) in the `ProtectedBranchesController`. Also use `::` to prefix the `ProtectedBranches` services, because this is required in EE. 3. Extract a `ProtectedBranchAccess` concern from the two access level models. This concern only has a single `humanize` method here, but will have more methods in EE. 4. Add `form_errors` to the protected branches creation form. This is not strictly required for EE compatibility, but was an oversight nonetheless.
| | | * | | Merge branch 'akismet-submittable' into 'master' Robert Speicher2016-08-152-49/+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-152-83/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactored SpamCheckService into SpamService
| | | | * | | Allow `SpamLog` to be submitted as hamPatricio Cano2016-08-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added `submitted_as_ham` to `SpamLog` to mark which logs have been submitted to Akismet. - Added routes and controller action.
| | | | * | | Refactored spam related code even furtherPatricio Cano2016-08-152-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | | | * | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-152-1/+35
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Merged `AkismetSubmittable` into `Spammable` - Clean up `SpamCheckService` - Added tests for `Spammable` - Added submit (ham or spam) options to `AkismetHelper`
| | * | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1510-69/+296
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-153-7/+7
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-125-23/+52
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 extend self over module_function, feedback:Lin Jen-Shin2016-08-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13672004 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810498
| | * | | | | Remove stage parameter from send payloadKamil Trzcinski2016-08-111-5/+1
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1120-840/+303
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-1152-354/+618
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | * | | | | | | We still need to skip loading config_processor if skip_ci?Lin Jen-Shin2016-08-051-1/+1
| | | | | | | | |
| | * | | | | | | Move those builders to their own namespace, feedback:Lin Jen-Shin2016-08-043-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13540099
| | * | | | | | | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-023-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20115
| * | | | | | | | Merge branch 'master' into mc-uiDouwe Maan2016-08-1513-76/+303
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Add small corrections to test coverage report badgeGrzegorz Bizon2016-08-151-2/+2
| | | | | | | | |
| | * | | | | | | Add metadata and template methods for coverage badgeGrzegorz Bizon2016-08-151-0/+8
| | | | | | | | |
| | * | | | | | | Extract base abstract template for badgesGrzegorz Bizon2016-08-153-35/+51
| | | | | | | | |
| | * | | | | | | Add template class for coverage report badgeGrzegorz Bizon2016-08-151-0/+69
| | | | | | | | |
| | * | | | | | | Extract the abstract base class of badge metadataGrzegorz Bizon2016-08-153-22/+42
| | | | | | | | |
| | * | | | | | | Add coverage report badge metadata classGrzegorz Bizon2016-08-151-0/+38
| | | | | | | | |
| | * | | | | | | Implement the main class of test coverage badgeGrzegorz Bizon2016-08-151-1/+30
| | | | | | | | |
| | * | | | | | | Refactor badge template and metadata classesGrzegorz Bizon2016-08-154-14/+19
| | | | | | | | |
| | * | | | | | | Move badges to separate modules and add base classGrzegorz Bizon2016-08-157-49/+74
| | | | | | | | |
| | * | | | | | | Add empty test coverage badge class and specsGrzegorz Bizon2016-08-151-0/+17
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge branch '20842-todos-queries-cache' into 'master' Yorick Peterse2016-08-151-5/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to get back todo's cache or at least avoid hitting the database See merge request !5789
| | | * | | | | | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-121-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We’re being kept up to date the counter data but we’re not using it. The only thing which is not real if is the number of projects that the user read changes the number of todos can be stale for some time. The counters will be sync just after the user receives a new todo or mark any as done
| | | * | | | | | Use cache for todos counter calling TodoServicePaco Guzman2016-08-121-1/+1
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch 'change-access-update' into 'master' Yorick Peterse2016-08-151-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the order of the access rules to check simpler first, and add specs See merge request !5799
| | | * | | | | | Change the order of the access rules to check simpler first, and add specschange-access-updateAlejandro Rodríguez2016-08-121-1/+1
| | | |/ / / / /