summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix repo hooks missing on importfix/import-project-hooksJames Lopez2016-07-284-2/+22
| | | | fix spec and added changelog
* Merge branch 'reduce-instrumentation-overhead' into 'master' Rémy Coutable2016-07-2810-54/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce instrumentation overhead ## What does this MR do? This MR reduces the overhead of instrumented methods. See the commit message of 905f8d763ab1184dc0b1e4bf6f18d7981753a860 for more information. ## Are there points in the code the reviewer needs to double check? Not that I can think of. ## Why was this MR needed? The overhead of method call instrumentation was too great. ## 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 - [ ] 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 !5550
| * Reduce instrumentation overheadYorick Peterse2016-07-2810-54/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the overhead of the method instrumentation code primarily by reducing the number of method calls. There are also some other small optimisations such as not casting timing values to Floats (there's no particular need for this), using Symbols for method call metric names, and reducing the number of Hash lookups for instrumented methods. The exact impact depends on the code being executed. For example, for a method that's only called once the difference won't be very noticeable. However, for methods that are called many times the difference can be more significant. For example, the loading time of a large commit (nrclark/dummy_project@81ebdea5df2fb42e59257cb3eaad671a5c53ca36) was reduced from around 19 seconds to around 15 seconds using these changes.
* | Merge branch 'add_commit_stats' into 'master' Rémy Coutable2016-07-284-0/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add commit stats ## What does this MR do? When getting commit by SHA in api it returns commit stats ## Are there points in the code the reviewer needs to double check? Not sure about test I added do we need separate test or we can just shove stats assertion in test above ## Why was this MR needed? So api users/clients can get statistics on single commit ## What are the relevant issue numbers? #20307 ## Screenshots (if relevant) ## 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 !5517
| * | Add commit stats to commit api responsedixpac2016-07-284-0/+15
| |/
* | Merge branch 'update_guide' into 'master' Valery Sizov2016-07-281-0/+191
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Added update guide for 8.11 ## What does this MR do? I need to add notes about Elastic on EE side. To not create ugly conflicts in the future and to not duplicate work I created it here first. I followed this guide https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#gitlab-ce See merge request !5545
| * Added update guide for 8.11Valery Sizov2016-07-281-0/+191
|/
* Merge branch 'rename-undefined-methods' into 'master' Robert Speicher2016-07-273-3/+3
|\ | | | | | | | | | | | | Replace reject_blocked with reject_blocked! in skipped callbacks. `reject_blocked!` was introduced in c9def945, I can't find any references to `reject_blocked` ever existing. See merge request !5532
| * Replace reject_blocked with reject_blocked! in callbacks.rename-undefined-methodsConnor Shea2016-07-273-3/+3
|/ | | | | | | | | | In Rails 4.2 and below, skipping callbacks (skip_before_action, skip_after_action, etc.) that use methods which do not exist will not throw any errors. On the other hand, Rails 5 does. See https://github.com/rails/rails/pull/19029 After testing with Rails 5 I noticed there are some methods that don't actually exist (because they were renamed, usually), this fixes a few instances of those. reject_blocked! was introduced in c9def945d4222eeb8026a0311495259bf99267a1, I can't find any references to reject_blocked ever existing.
* Merge branch 'akismet-ui-check' into 'master' Douwe Maan2016-07-2712-35/+122
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submit new issues created via the WebUI or API to Akismet for spam check on public projects. ## What does this MR do? Submit new issues created via the WebUI by non project members to Akismet for spam check. ## Why was this MR needed? Support for Akismet was added only to the API with !2266. This MR builds on that functionality to also check issues submitted via the WebUI for spam. ## What are the relevant issue numbers? Related to: - #5573 - #5932 - gitlab-com/infrastructure#14 - gitlab-com/support#61 - !2266 cc @stanhu @MrChrisW See merge request !5333
| * Refactor spam validation to a concern that can be easily reused and improve ↵akismet-ui-checkPatricio Cano2016-07-269-44/+63
| | | | | | | | legibility in `SpamCheckService`
| * Refactor `SpamCheckService` to make it cleaner and clearer.Patricio Cano2016-07-266-39/+38
| |
| * Submit all issues on public projects to Akismet if enabled.Patricio Cano2016-07-269-36/+54
| |
| * Submit new issues created via the WebUI by non project members to Akismet ↵Patricio Cano2016-07-266-13/+64
| | | | | | | | for spam check.
* | Merge branch 'fix/requests-profiles-controller-does-not-catch-certain-files'Douwe Maan2016-07-272-1/+2
|\ \
| * | Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-filesAhmad Sherif2016-07-272-1/+2
| | |
* | | Merge branch 'cs-upgrade-attr-encrypted' into 'master' Robert Speicher2016-07-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update attr_encrypted from 3.0.1 to 3.0.2 This removes methods that were deprecated by Rails 5 so we won't have as many deprecation warnings when we update to Rails 5. Working toward #14286. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#302 See merge request !5438
| * | | Update attr_encrypted from 3.0.1 to 3.0.3cs-upgrade-attr-encryptedConnor Shea2016-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This removes methods that were deprecated by Rails 5. Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.md#303
* | | | Merge branch 'cs-upgrade-rack-oauth2' into 'master' Robert Speicher2016-07-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rack-oauth2 from 1.2.1 to 1.2.3. Removes methods deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3 See merge request !5439
| * | | | Update rack-oauth2 from 1.2.1 to 1.2.3.cs-upgrade-rack-oauth2Connor Shea2016-07-221-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Removes methods deprecated in Rails 5. https://github.com/nov/rack-oauth2/compare/v1.2.1...v1.2.3
* | | | Merge branch 'cs-upgrade-bullet' into 'master' Robert Speicher2016-07-272-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Bullet from 5.0.0 to 5.2.0 Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520-07262016 See merge request !5443
| * | | | Upgrade Bullet from 5.0.0 to 5.2.0.cs-upgrade-bulletConnor Shea2016-07-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes methods that were deprecated in Rails 5. Changelog: https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md#520
* | | | | Merge branch 'cs-upgrade-gon' into 'master' Robert Speicher2016-07-272-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gon from 6.0.1 to 6.1.0. Removes methods that were deprecated in Rails 5. Working toward #14286. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9 See merge request !5442
| * | | | | Upgrade gon from 6.0.1 to 6.1.0.cs-upgrade-gonConnor Shea2016-07-222-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Removes methods that were deprecated in Rails 5. Changelog: https://github.com/gazay/gon/compare/3a2b56d...9d89bc9
* | | | | Merge branch 'cs-upgrade-default-value-for' into 'master' Robert Speicher2016-07-271-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade default_value_for from 3.0.1 to 3.0.2. Includes support for Rails 5. Working toward #14286. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2 See merge request !5441
| * | | | | Upgrade default_value_for from 3.0.1 to 3.0.2.cs-upgrade-default-value-forConnor Shea2016-07-221-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Includes support for Rails 5. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2
* | | | | Merge branch 'fix-19538' into 'master' Robert Speicher2016-07-277-3/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix renaming repository when name contains invalid chars under settings Fixes #19538 See merge request !5490
| * | | | | Fix Project#to_param to keep invalid project suitable for use in URLsDouglas Barbosa Alexandre2016-07-276-35/+26
| | | | | |
| * | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-271-0/+1
| | | | | |
| * | | | | Add feature specs for edit project settingsDouglas Barbosa Alexandre2016-07-271-0/+41
| | | | | |
| * | | | | Fix renaming repository when name contains invalid chars under settingsDouglas Barbosa Alexandre2016-07-274-3/+36
| | | | | |
* | | | | | Merge branch 'simple-cov' into 'master' Robert Speicher2016-07-279-19/+133
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate coverage report from whole test suite Extends our CI plan to merge all coverage results and generate HTML report. See merge request !5018
| * | | | | Depened on exact version of SimpleCov when patchedsimple-covGrzegorz Bizon2016-07-272-2/+2
| | | | | |
| * | | | | Deploy test coverage report on master pipeline onlyGrzegorz Bizon2016-07-221-0/+2
| | | | | |
| * | | | | Improve CI configuration file for pages stageGrzegorz Bizon2016-07-221-6/+6
| | | | | |
| * | | | | Deploy ruby test coverage report to gitlab pagesGrzegorz Bizon2016-07-211-14/+29
| | | | | |
| * | | | | Revert eager loading in test env that breakes teaspoonGrzegorz Bizon2016-07-211-1/+1
| | | | | |
| * | | | | Introduce SimpleCovEnv singleton helper and use itGrzegorz Bizon2016-07-214-37/+51
| | | | | |
| * | | | | Patch SimpleCov to reuse code for coverage mergerGrzegorz Bizon2016-07-211-53/+21
| | | | | |
| * | | | | Improve simplecov config to avoid missing filesGrzegorz Bizon2016-07-211-1/+9
| | | | | |
| * | | | | Load app in test env eagerly to improve test coverageGrzegorz Bizon2016-07-211-1/+1
| | | | | |
| * | | | | Remove unused coverallsKamil Trzcinski2016-07-212-4/+4
| | | | | |
| * | | | | Use simplecov 0.12.0 which fixes merging test resultsKamil Trzcinski2016-07-212-33/+2
| | | | | |
| * | | | | Fix spinach testsKamil Trzcinski2016-07-211-1/+1
| | | | | |
| * | | | | Fix SimpleCov report mergingKamil Trzcinski2016-07-212-2/+38
| | | | | |
| * | | | | Update configuration of SimpleCovKamil Trzcinski2016-07-215-16/+26
| | | | | |
| * | | | | Store all simplecov configuration in one fileKamil Trzcinski2016-07-214-22/+24
| | | | | |
| * | | | | Fix update-coverage jobKamil Trzcinski2016-07-211-1/+4
| | | | | |
| * | | | | Add simplecov to spinach testsKamil Trzcinski2016-07-211-0/+8
| | | | | |
| * | | | | Remove unused simplecov-rcovKamil Trzcinski2016-07-211-1/+0
| | | | | |