summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | Use `scripts/merge-simplecov`Kamil Trzcinski2016-07-213-64/+66
| | | | | |
| * | | | | Merge coverage reportKamil Trzcinski2016-07-214-5/+83
| | | | | |
* | | | | | Merge branch 'allow-skipping-users-in-autocomplete' into 'master' Robert Speicher2016-07-274-14/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow skipping users in autocomplete Ref: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/560 See merge request !5471
| * | | | | | Allow skipping users in autocompleteallow-skipping-users-in-autocompleteSean McGivern2016-07-274-14/+34
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass an array of user IDs in the `skip_users` param to have them excluded from the results (unless they are explicitly included through the `current_user` or `author_id` params).
* | | | | | Merge branch '5571-hipchat-notifications-missing-colors' into 'master' Robert Speicher2016-07-273-9/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "HipChat notifications missing colors" _Originally opened at !2322 by @eisnerd._ - - - ## What does this MR do? This MR restores the colors mentioned in #5571 by overriding the color setting with green/red just for build events. ## What are the relevant issue numbers? Closes #5571. See merge request !5498
| * | | | | | Move color-logic into HipchatService#HipchatService5571-hipchat-notifications-missing-colorsRémy Coutable2016-07-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Little refactor, add specs, and a CHANGELOG entryRémy Coutable2016-07-263-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | HipChat notification color overridden by build statusDavid Eisner2016-07-261-3/+11
| | | | | | |
View Lorry Controller Status