Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1 from christophermanning/update_rails_admin

Update rails_admin
  • Loading branch information...
commit aca4ea12145e6a3f8335929ba023fdd599f06314 2 parents 374b142 + ebf8054
@bbenezech authored
Showing with 67 additions and 62 deletions.
  1. +67 −62 Gemfile.lock
View
129 Gemfile.lock
@@ -1,17 +1,18 @@
GIT
remote: git://github.com/sferik/rails_admin.git
- revision: 254018ed5c4bf8210e190a6a6622fc89012a41d8
+ revision: c7a6a176f7ac083c2fad39ae087f76c4785e5010
specs:
- rails_admin (0.0.1)
- bbenezech-nested_form (~> 0.0.6)
- bootstrap-sass (~> 2.0)
+ rails_admin (0.3.0)
+ bootstrap-sass (~> 2.1)
builder (~> 3.0)
coffee-rails (~> 3.1)
+ font-awesome-sass-rails (~> 2.0)
haml (~> 3.1)
- jquery-rails (>= 1.0)
- jquery-ui-rails (~> 0.2.2)
- kaminari (~> 0.12)
- rack-pjax (~> 0.5)
+ jquery-rails (~> 2.1)
+ jquery-ui-rails (~> 2.0)
+ kaminari (~> 0.14)
+ nested_form (~> 0.2)
+ rack-pjax (~> 0.6)
rails (~> 3.1)
remotipart (~> 1.0)
sass-rails (~> 3.1)
@@ -19,38 +20,38 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
- bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.0.2)
- builder (3.0.0)
+ bootstrap-sass (2.2.1.1)
+ sass (~> 3.2)
+ builder (3.0.4)
cancan (1.6.7)
carrierwave (0.6.2)
activemodel (>= 3.2.0)
@@ -62,7 +63,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
+ coffee-script-source (1.4.0)
devise (1.5.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
@@ -70,33 +71,34 @@ GEM
dragonfly (0.9.12)
rack
erubis (2.7.0)
- execjs (1.3.1)
+ execjs (1.4.0)
multi_json (~> 1.0)
faraday (0.8.0)
multipart-post (~> 1.1)
faraday_middleware (0.8.7)
faraday (>= 0.7.4, < 0.9)
- haml (3.1.4)
+ font-awesome-sass-rails (2.0.0.0)
+ railties (>= 3.1.1)
+ sass-rails (>= 3.1.1)
+ haml (3.1.7)
hike (1.2.1)
- hpricot (0.8.6)
- i18n (0.6.0)
- journey (1.0.3)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- jquery-ui-rails (0.2.2)
+ i18n (0.6.1)
+ journey (1.0.4)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ jquery-ui-rails (2.0.2)
jquery-rails
railties (>= 3.1.0)
- json (1.7.0)
- kaminari (0.13.0)
+ json (1.7.5)
+ kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.18)
+ mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
mlb (0.6.1)
@@ -104,8 +106,10 @@ GEM
faraday_middleware (~> 0.8)
json (~> 1.7)
multi_json (~> 1.3)
- multi_json (1.3.4)
+ multi_json (1.4.0)
multipart-post (1.1.5)
+ nested_form (0.3.1)
+ nokogiri (1.5.5)
orm_adapter (0.0.7)
paperclip (2.7.0)
activerecord (>= 2.3.0)
@@ -117,49 +121,50 @@ GEM
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
- rack-pjax (0.5.9)
- hpricot (~> 0.8.6)
+ rack-pjax (0.6.0)
+ nokogiri (~> 1.5)
rack (~> 1.3)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.3)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2.2)
+ thor (>= 0.14.6, < 2.0)
+ rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
remotipart (1.0.2)
- sass (3.1.16)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
subexec (0.2.2)
- thor (0.14.6)
+ thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
Please sign in to comment.
Something went wrong with that request. Please try again.