summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.Connor Shea2016-05-191-5/+7
| | | | | | 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-12/+6
|\ | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * Merge branch 'remove-deprecated-finders' into 'master' Douwe Maan2016-05-131-2/+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-2/+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-3/+0
| | |/ | |/| | | | | | | | | | | | | Instead the script is now included directly from the vendor directory. Resolves #17166.
| * | Update Ace EditorAlfredo Sumaran2016-05-101-2/+2
| |/
| * Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-5/+1
| | | | | | | | | | | | | | | | | | 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-25/+28
|\ \ | |/
| * Updated gitlab_git to 10.1.0Yorick Peterse2016-05-051-1/+1
| |
| * Upgrade Sidekiq to 4.1.2Stan Hu2016-05-051-2/+2
| |
| * Merge branch 'stanhu/gitlab-ce-bump-mailroom'Douwe Maan2016-05-051-2/+2
| |\
| | * Bump mail_room to 0.7.0 to fix stuck IDLE connectionsStan Hu2016-04-301-2/+2
| | | | | | | | | | | | Closes #13357
| * | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-041-1/+1
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
| | * | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-291-1/+1
| | | | | | | | | | | | - Parameter validation as ISO8601 format
| * | | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-041-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | 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-18/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-04-291-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Doorkeeper from 2.2.2 to 3.1.0 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 Working toward #14286. See merge request !3644
| | * | Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea2016-04-281-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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/+2
| | |
* | | Added authentication service for docker registryKamil Trzcinski2016-04-291-0/+1
|/ /
* | Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-291-3/+3
|/ | | | | | | | This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
* Merge branch 'rs-letter_opener_web' into 'master' Dmitriy Zaporozhets2016-04-271-2/+6
|\ | | | | | | | | | | | | | | | | 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-2/+6
| | | | | | | | | | | | 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-3/+0
| | | | | | | | | | | | The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration. Resolves #15575.
* | Merge branch 'upgrade-gitlab-grit' into 'master' Robert Speicher2016-04-251-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency. Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc Resolves #15101. See merge request !3901
| * | Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version ↵Connor Shea2016-04-241-3/+3
| | | | | | | | | | | | | | | | | | dependency. Resolves #15101.
* | | Merge branch 'update-jquery-rails' into 'master' Robert Speicher2016-04-251-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | |
* | | Merge branch 'upgrade-sidekiq' into 'master' Robert Speicher2016-04-221-4/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Update Sidekiq and related gems (bundle update sidekiq) Closes #15079 See merge request !3817
| * | Update Sidekiq and related gems (bundle update sidekiq)Stan Hu2016-04-191-4/+3
| | | | | | | | | | | | Closes #15079
* | | 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
| * | Update to licensee 8.0.0 and fix API specsRémy Coutable2016-04-181-3/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Initial implementation if license template selector and /licenses/:key API ↵Anton Davydov2016-04-181-0/+3
| | | | | | | | | | | | endpoint
* | | Update octokit gem to version 4.3.0Douglas Barbosa Alexandre2016-04-181-5/+5
|/ /
* | Update spring and spring-commands-spinachrs-update-springRobert Speicher2016-04-121-4/+4
| | | | | | | | Spring changelog: https://git.io/vVAUY
* | Merge branch 'upgrade-annotate' into 'master' Robert Speicher2016-04-111-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
| * | Upgrade annotate from 2.6.10 to 2.7.0connorshea2016-04-101-3/+3
| |/ | | | | | | | | | | | | | | | | Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
* | Upgrade premailer-rails from 1.9.0 to 1.9.2connorshea2016-04-101-3/+3
|/ | | | | | | | | | Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
* Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea2016-04-091-2/+3
| | | | | | Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
* Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-091-36/+36
|\ | | | | | | | | Bump rails to 4.2.6 See merge request !3424
| * Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-051-36/+36
| |
* | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
| * | Make redis an explicit Gemfile dependencyJacob Vosmaer2016-04-061-0/+1
| |/
* | Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea2016-04-061-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
* | Merge branch 'upgrade-bundler-audit' into 'master' Robert Speicher2016-04-051-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | Upgrade bundler-audit from 0.4.0 to 0.5.0 Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)). See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28 See merge request !3433
| * Upgrade bundler-audit from 0.4.0 to 0.5.0connorshea2016-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | Bundler Audit can now run check with the `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI. See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2 015-02-28
View Lorry Controller Status