summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-update-doorkeeper' into 'master'Robert Speicher2016-08-191-3/+3
* Merge branch 'rails-4-2-7-1' into 'master'Robert Speicher2016-08-151-33/+33
* Merge branch 'downgrade-redis-3-2-2' into 'master'Robert Speicher2016-07-061-1/+1
* Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master'Stan Hu2016-07-061-2/+2
* Merge branch 'update-omniauth-saml' into 'master'Stan Hu2016-06-271-5/+4
* Merge branch 'bump-gitlab-git-10-2-1' into 'master'Stan Hu2016-06-231-1/+1
* Merge branch 'update-mail_room-to-0.8.0' into 'master' Douwe Maan2016-06-211-2/+2
* Merge branch 'update-browser-gem' into 'master' Robert Speicher2016-06-211-2/+2
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-171-2/+2
* Merge branch 'bump-gitlab-git-10.2.0' into 'master' Robert Speicher2016-06-161-2/+2
* Merge branch 'gitlab_git-10.1.4' into 'master' Stan Hu2016-06-161-1/+1
* Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-2/+0
* Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-151-2/+2
|\
| * Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-121-2/+2
* | Update the allocations Gem to 1.0.5Yorick Peterse2016-06-141-1/+1
* | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-23/+5
|\ \
| * | Update brakeman from 3.2.1 to 3.3.2Connor Shea2016-06-121-23/+5
| |/
* | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+4
|/
* 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
View Lorry Controller Status