summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-1/+0
|\
| * Replace raphael-rails with raphael.js so it can be split from the rest of the...Connor Shea2016-06-101-1/+0
* | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
|\ \
| * | Update brakeman from 3.2.1 to 3.3.2Connor Shea2016-06-121-1/+1
| |/
* | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+3
|/
* Merge branch 'support-fog-azure' into 'master' Rémy Coutable2016-06-081-0/+1
|\
| * 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
|/
* 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
|\
| * Merge branch 'license-finder-gem' into 'master' Rémy Coutable2016-06-071-0/+2
| |\
| | * Add License Finder gem.Connor Shea2016-06-061-0/+2
| * | Bump rouge to 1.11.0Stan Hu2016-06-061-1/+1
| |/
| * Update the `browser` gem.Timothy Andrew2016-06-061-1/+1
| * Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-0/+1
| * Replace colorize gem with rainbow.Connor Shea2016-06-031-1/+1
* | 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 dependenciesreduce-fog-depsStan Hu2016-06-011-1/+7
* | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-4/+3
|\ \ | |/ |/|
| * Upgrade attr_encrypted and encryptorConnor Shea2016-05-301-1/+1
| * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-3/+2
* | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-311-1/+1
|/
* Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-251-3/+0
|\
| * 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
* | Add rubocop-rspecrs-rubocop-rspecRobert Speicher2016-05-231-0/+1
* | 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
* | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-131-4/+4
|\ \ | |/
| * Merge branch 'remove-deprecated-finders' into 'master' Douwe Maan2016-05-131-1/+0
| |\
| | * Remove activerecord-deprecated_finders gemConnor Shea2016-05-101-1/+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-1/+0
| | |/ | |/|
| * | Update Ace EditorAlfredo Sumaran2016-05-101-1/+1
| |/
| * Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-091-1/+0
* | 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
| * | Merge branch 'revert-devise-async' into 'master' Rémy Coutable2016-05-041-0/+1
| |\ \
| | * | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+1
| | |/
| * | Update rspec-rails from 3.3.3 to 3.4.2.Connor Shea2016-05-011-1/+1
| |/
| * Upgrade Doorkeeper from 2.2.2 to 3.1.0connorshea2016-04-281-1/+1
* | 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 gemrs-letter_opener_webRobert Speicher2016-04-221-1/+1
View Lorry Controller Status