summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'support-fog-azure' into 'master' Rémy Coutable2016-06-081-0/+21
|\
| * Add Azure to supported backup list (left out accidentally)Stan Hu2016-06-071-0/+21
* | Merge branch 'bump-recaptcha-gem' into 'master' Robert Speicher2016-06-071-2/+2
|\ \
| * | Bump recaptcha gem to 3.0.0 to remove deprecated stoken supportStan Hu2016-06-071-2/+2
| |/
* | Bump nokogiri to 1.6.8Stan Hu2016-06-071-3/+5
|/
* Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski2016-06-071-6/+17
|\
| * Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-071-0/+9
| |\
| | * Add gems and licenses that were previously missing. Approve a number of licen...Connor Shea2016-06-061-0/+1
| | * Add License Finder gem.Connor Shea2016-06-061-0/+8
| * | Bump rouge to 1.11.0Stan Hu2016-06-061-2/+2
| |/
| * Update the `browser` gem.Timothy Andrew2016-06-061-3/+3
| * Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-0/+2
| * Replace colorize gem with rainbow.Connor Shea2016-06-031-1/+1
* | Use knapsack 1.11.0Kamil Trzcinski2016-06-031-2/+2
* | Fix knapsack usageKamil Trzcinski2016-06-031-1/+1
* | Use own version of knapsack which supports spinach testsKamil Trzcinski2016-06-031-2/+2
* | Try to use knapsackKamil Trzcinski2016-06-031-0/+5
|/
* Merge branch 'reduce-fog-deps' into 'master' Robert Speicher2016-06-021-98/+16
|\
| * Reduce number of fog gem dependenciesreduce-fog-depsStan Hu2016-06-011-98/+16
* | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-19/+15
|\ \ | |/ |/|
| * Upgrade attr_encrypted and encryptorConnor Shea2016-05-301-4/+4
| * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-15/+11
* | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-311-2/+2
|/
* Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-2/+0
|\
| * Removed cal heatmap from gemfilePhil Hughes2016-05-161-2/+0
* | Update state_machines-activerecord from 0.3.0 to 0.4.0.Connor Shea2016-05-251-5/+5
* | Add rubocop-rspecrs-rubocop-rspecRobert Speicher2016-05-231-0/+3
* | Update rubocop to 0.40.0Robert Speicher2016-05-231-7/+7
* | Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.Connor Shea2016-05-191-5/+7
* | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-131-12/+6
|\ \ | |/
| * Merge branch 'remove-deprecated-finders' into 'master' Douwe Maan2016-05-131-2/+0
| |\
| | * Remove activerecord-deprecated_finders gemConnor Shea2016-05-101-2/+0
| * | Merge branch 'health-check-route'Douwe Maan2016-05-121-0/+3
| |\ \
| | * | 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
| | |/ | |/|
| * | Update Ace EditorAlfredo Sumaran2016-05-101-2/+2
| |/
| * Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-5/+1
* | 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
| * | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-041-1/+1
| |\ \
| | * | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-291-1/+1
| * | | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-041-0/+3
| |\ \ \
| | * | | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+3
| | | |/ | | |/|
| * | | Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea2016-05-011-18/+18
| |/ /
| * | Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-04-291-2/+2
| |\ \
| | * | Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea2016-04-281-2/+2
| | |/
* | | Added JWT controllerKamil Trzcinski2016-05-021-0/+2
View Lorry Controller Status