summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'support-fog-azure' into 'master' Rémy Coutable2016-06-081-0/+1
|\ | | | | | | | | | | | | | | Add fog-azure to supported backup list !4396 left out Azure by accident. See merge request !4444
| * Add Azure to supported backup list (left out accidentally)Stan Hu2016-06-071-0/+1
| |
* | Bump recaptcha gem to 3.0.0 to remove deprecated stoken supportStan Hu2016-06-071-1/+1
|/ | | | Closes #18210
* Load knapsack in Rakefile only when is bundledload-knapsack-if-definedKamil Trzcinski2016-06-071-1/+1
|
* Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski2016-06-071-3/+6
|\ | | | | | | | | # Conflicts: # .gitlab-ci.yml
| * Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-071-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License finder gem Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license. https://github.com/pivotal/LicenseFinder See also: gitlab-com/operations#164 See merge request !3775
| | * Add License Finder gem.Connor Shea2016-06-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to rehost all our gems in our own gem host, we need to have the legal rights to do so for every gem should they be taken down from RubyGems. License Finder automates checking of gems to ensure that we're in the clear legally. Approved the MIT License because it essentially allows us to do "whatever" with those gems. I am not a lawyer. https://github.com/pivotal/LicenseFinder
| * | Bump rouge to 1.11.0Stan Hu2016-06-061-1/+1
| |/
| * Update the `browser` gem.Timothy Andrew2016-06-061-1/+1
| | | | | | | | | | - Need the `mobile?` detection (that the new version provides) for the U2F registration/ authentication flow
| * Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - To hold registrations from U2F devices, and to authenticate them. - Previously, `User#two_factor_enabled` was aliased to the `otp_required_for_login` column on `users`. - This commit changes things a bit: - `User#two_factor_enabled` is not a method anymore - `User#two_factor_enabled?` checks both the `otp_required_for_login` column, as well as `U2fRegistration`s - Change all instances of `User#two_factor_enabled` to `User#two_factor_enabled?` - Add the `u2f` gem, and implement registration/authentication at the model level.
| * Replace colorize gem with rainbow.Connor Shea2016-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Colorize is a gem licensed under the GPLv2, so we can’t use it in GitLab without relicensing GitLab under the terms of the GPL. Rainbow is licensed under the MIT license and does the exact same thing as Colorize, so Rainbow was added in place of Colorize. The syntax is slightly different for Rainbow vs. Colorize, and was updated in accordance. The gem is still a dependency of Spinach, so it’s included in the development/test environments, but won’t be packaged with the actual product, and therefore doesn’t require we relicense the product. An attempt at relicensing Colorize was made, but didn’t succeed as the library owner never responded. Rainbow library: https://github.com/sickill/rainbow Relevant issue regarding licensing in GitLab's gems: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3775
* | Use knapsack 1.11.0Kamil Trzcinski2016-06-031-1/+1
| |
* | Use own version of knapsack which supports spinach testsKamil Trzcinski2016-06-031-1/+1
| |
* | Try to use knapsackKamil Trzcinski2016-06-031-0/+1
|/
* Merge branch 'reduce-fog-deps' into 'master' Robert Speicher2016-06-021-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce number of fog gem dependencies Currently supported: * AWS * Azure * OpenStack * Google * local storage Closes #15352 See merge request !4396
| * Reduce number of fog gem dependenciesreduce-fog-depsStan Hu2016-06-011-1/+7
| | | | | | | | Closes #15352
* | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-4/+3
|\ \ | |/ |/| | | | | | | | | | | | | Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216
| * Upgrade attr_encrypted and encryptorConnor Shea2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | attr_encrypted (1.3.4 => 3.0.1) Changelog: https://github.com/attr-encrypted/attr_encrypted/blob/master/CHANGELOG.m d attr_encrypted 2.x included a vulnerability, so that major version is skipped. 3.x requires that the algorithm and mode used by each encrypted attribute is specified explicitly. `nil` is no longer a valid value for the encrypted_value_iv field, so it’s changed to a randomly generated string.
| * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Devise (3.5.4 => 4.1.1) Changelog: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md devise-two-factor (2.0.1 => 3.0.0) Changelog: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md These are reliant on each other, so they have to be upgraded together. devise-async is no longer necessary as Devise 4.1 fixes a bug with the ActiveJob integration.
* | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-311-1/+1
|/ | | | | | Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170 Deprecates num_pages in favor of total_pages and includes Rails 5 support.
* Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-3/+0
|\ | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| * Removed cal heatmap from gemfilePhil Hughes2016-05-161-3/+0
| |
* | Update state_machines-activerecord from 0.3.0 to 0.4.0.Connor Shea2016-05-251-1/+1
| | | | | | | | | | | | No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master Includes Rails 5 support.
* | Add rubocop-rspecrs-rubocop-rspecRobert Speicher2016-05-231-0/+1
| | | | | | | | | | Almost all cops are starting as disabled until we can fix their violations.
* | Update rubocop to 0.40.0Robert Speicher2016-05-231-2/+2
| |
* | Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.Connor Shea2016-05-191-1/+1
| | | | | | | | | | | | Changelog: https://github.com/rails/activerecord-session_store/releases/tag/v1.0.0 Includes Rails 5 support.
* | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-131-4/+4
|\ \ | |/ | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * Merge branch 'remove-deprecated-finders' into 'master' Douwe Maan2016-05-131-1/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove activerecord-deprecated_finders gem We don’t use any of the deprecated finders, so it should be safe to remove. See https://github.com/rails/activerecord-deprecated_finders#active-record-deprecated-finders for more information. Resolves #17015. See merge request !3981
| | * Remove activerecord-deprecated_finders gemConnor Shea2016-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | | We don’t use any of the deprecated finders, so it should be safe to remove. Resolves #17015.
| * | Merge branch 'health-check-route'Douwe Maan2016-05-121-0/+3
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | Add the health_check gem end expose the health_check routeDJ Mountney2016-05-101-0/+3
| | | |
| * | | Removes jquery-scrollto-rails.Connor Shea2016-05-101-1/+0
| | |/ | |/| | | | | | | | | | | | | Instead the script is now included directly from the vendor directory. Resolves #17166.
| * | Update Ace EditorAlfredo Sumaran2016-05-101-1/+1
| |/
| * Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-1/+0
| | | | | | | | | | | | | | | | | | In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
* | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-091-3/+4
|\ \ | |/
| * Merge branch 'stanhu/gitlab-ce-bump-mailroom'Douwe Maan2016-05-051-1/+1
| |\
| | * Bump mail_room to 0.7.0 to fix stuck IDLE connectionsStan Hu2016-04-301-1/+1
| | | | | | | | | | | | Closes #13357
| * | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-041-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
| | * | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+1
| | |/ | | | | | | | | | | | | | | | This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
| * | Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea2016-05-011-1/+1
| |/ | | | | | | | | | | | | | | This allows the removal of the monkey patch from this commit: 47ff1c56089b3df9c36b77c02f0f3db54fea1d54 It'll also make it slightly easier to upgrade to 3.5.0 later. Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
| * Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | I’d rather upgrade one major version at a time, so Doorkeeper needs to be upgraded to 3.x before it can be upgraded to 4.x (which includes Rails 5 support). Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
* | Added JWT controllerKamil Trzcinski2016-05-021-0/+1
| |
* | Added authentication service for docker registryKamil Trzcinski2016-04-291-0/+1
|/
* Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets2016-04-271-1/+1
|\ | | | | | | | | | | | | | | | | Add letter_opener_web gem Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route. See merge request !3893
| * Add letter_opener_web gemrs-letter_opener_webRobert Speicher2016-04-221-1/+1
| | | | | | | | | | | | Sent emails in the development environment will no longer automatically be opened in the browser. If a sent email needs to be viewed, it can be found at the `/rails/letter_opener` route.
* | Remove the Devise Async gem.Connor Shea2016-04-261-1/+0
| | | | | | | | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* | Merge branch 'update-jquery-rails' into 'master' Robert Speicher2016-04-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade jQuery Rails from 4.0.5 to 4.1.1 Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: - https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md - https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ - https://github.com/rails/jquery-ujs/releases See merge request !3642
| * | Upgrade jQuery Rails from 4.0.5 to 4.1.1connorshea2016-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1. Changelogs: https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/ https://github.com/rails/jquery-ujs/releases
* | | Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates.Luke Howell2016-04-241-1/+1
| |/ |/|
* | Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher2016-04-201-0/+3
|\ \ | | | | | | | | | | | | | | | | | | License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
View Lorry Controller Status