Search
j0ke.net Open Build Service
>
Projects
>
ha
:
firewall
:
Snorby
>
Snorby
> 150076e60f31607b7f776faf3cdbc7349c6d26d5.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File 150076e60f31607b7f776faf3cdbc7349c6d26d5.patch of Package Snorby
commit 150076e60f31607b7f776faf3cdbc7349c6d26d5 Author: Dustin Willis Webber <dustin.webber@gmail.com> Date: Mon Feb 11 18:04:11 2013 -0600 rails version bump 3.1.11 - json ~> 1.7 diff --git a/Gemfile b/Gemfile index 309207e..4b7f2cf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,17 +1,17 @@ source 'http://rubygems.org' -RAILS_VERSION = '3.1.10' +RAILS_VERSION = '3.1.11' RSPEC_VERSION = '~> 2.0.0' DATAMAPPER = 'http://github.com/datamapper' DM_VERSION = '~> 1.2.0' gem 'rake', '0.9.2' -gem 'thin' gem 'rails', RAILS_VERSION gem 'jquery-rails' gem 'bundler', '>= 1.0.0' gem 'env' +gem 'json', '~> 1.7' # Jruby gem 'jruby-openssl', :platforms => :jruby @@ -81,6 +81,7 @@ gem 'netaddr', '~> 1.5.0' group(:development) do gem "letter_opener" + gem 'thin' end group(:test) do diff --git a/Gemfile.lock b/Gemfile.lock index 7e1129f..7834af2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,12 +34,12 @@ GEM Platform (0.4.0) RedCloth (4.2.9) RedCloth (4.2.9-java) - actionmailer (3.1.10) - actionpack (= 3.1.10) + actionmailer (3.1.11) + actionpack (= 3.1.11) mail (~> 2.3.3) - actionpack (3.1.10) - activemodel (= 3.1.10) - activesupport (= 3.1.10) + actionpack (3.1.11) + activemodel (= 3.1.11) + activesupport (= 3.1.11) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) @@ -48,20 +48,20 @@ GEM rack-mount (~> 0.8.2) rack-test (~> 0.6.1) sprockets (~> 2.0.4) - activemodel (3.1.10) - activesupport (= 3.1.10) + activemodel (3.1.11) + activesupport (= 3.1.11) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.10) - activemodel (= 3.1.10) - activesupport (= 3.1.10) + activerecord (3.1.11) + activemodel (= 3.1.11) + activesupport (= 3.1.11) arel (~> 2.2.3) tzinfo (~> 0.3.29) - activeresource (3.1.10) - activemodel (= 3.1.10) - activesupport (= 3.1.10) - activesupport (3.1.10) - multi_json (>= 1.0, < 1.3) + activeresource (3.1.11) + activemodel (= 3.1.11) + activesupport (= 3.1.11) + activesupport (3.1.11) + multi_json (~> 1.0) addressable (2.2.8) ansi (1.4.3) arel (2.2.3) @@ -193,8 +193,8 @@ GEM jruby-rack (1.1.12) jruby-rack-worker (0.9.1) jruby-rack (>= 1.1.10) - json (1.7.6) - json (1.7.6-java) + json (1.7.7) + json (1.7.7-java) json_pure (1.7.6) launchy (2.1.0) addressable (~> 2.2.6) @@ -213,7 +213,7 @@ GEM treetop (~> 1.4.8) mime-types (1.19) minitest (4.4.0) - multi_json (1.2.0) + multi_json (1.5.1) net-dns (0.6.1) net-scp (1.0.4) net-ssh (>= 1.99.1) @@ -229,32 +229,32 @@ GEM orm_adapter (0.0.7) pdfkit (0.4.6) polyglot (0.3.3) - rack (1.3.8) + rack (1.3.10) rack-cache (1.2) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) - rack-ssl (1.3.2) + rack-ssl (1.3.3) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.1.10) - actionmailer (= 3.1.10) - actionpack (= 3.1.10) - activerecord (= 3.1.10) - activeresource (= 3.1.10) - activesupport (= 3.1.10) + rails (3.1.11) + actionmailer (= 3.1.11) + actionpack (= 3.1.11) + activerecord (= 3.1.11) + activeresource (= 3.1.11) + activesupport (= 3.1.11) bundler (~> 1.0) - railties (= 3.1.10) - railties (3.1.10) - actionpack (= 3.1.10) - activesupport (= 3.1.10) + railties (= 3.1.11) + railties (3.1.11) + actionpack (= 3.1.11) + activesupport (= 3.1.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2) - rdoc (3.12) + rdoc (3.12.1) json (~> 1.4) rspec (2.0.1) rspec-core (~> 2.0.1) @@ -317,9 +317,9 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.2.9) - actionmailer (= 3.1.10) - actionpack (= 3.1.10) - activesupport (= 3.1.10) + actionmailer (= 3.1.11) + actionpack (= 3.1.11) + activesupport (= 3.1.11) ansi bundler (>= 1.0.0) capistrano (= 2.14.1) @@ -357,14 +357,15 @@ DEPENDENCIES jquery-rails jruby-openssl jruby-rack-worker + json (~> 1.7) letter_opener mail (~> 2.3) minitest net-dns (~> 0.6.1) netaddr (~> 1.5.0) pdfkit (~> 0.4.6) - rails (= 3.1.10) - railties (= 3.1.10) + rails (= 3.1.11) + railties (= 3.1.11) rake (= 0.9.2) rspec (~> 2.0.0) rspec-core (~> 2.0.0)
