Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rails_admin from 1.0.0 to 1.4.3 #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump rails_admin from 1.0.0 to 1.4.3 #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 61 additions & 43 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ GEM
arel (6.0.3)
ast (2.3.0)
bcrypt (3.1.11)
builder (3.2.2)
coffee-rails (4.2.1)
builder (3.2.4)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
railties (>= 4.0.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
coffee-script-source (1.12.2)
concurrent-ruby (1.1.7)
coveralls (0.8.15)
json (>= 1.8, < 3)
simplecov (~> 0.12.0)
Expand All @@ -57,6 +57,7 @@ GEM
tins (>= 1.6.0, < 2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -67,35 +68,45 @@ GEM
erubis (2.7.0)
execjs (2.7.0)
fastercsv (1.5.5)
font-awesome-rails (4.6.3.1)
railties (>= 3.2, < 5.1)
ffi (1.14.2)
font-awesome-rails (4.7.0.6)
railties (>= 3.2, < 6.2)
geokit (1.10.0)
globalid (0.3.7)
activesupport (>= 4.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
haml (4.0.7)
tilt
hashdiff (0.3.0)
http_accept_language (2.0.5)
i18n (0.7.0)
jquery-rails (4.2.1)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.3)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
loofah (2.0.3)
json (1.8.6)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
loofah (2.8.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mail (2.7.1)
mini_mime (>= 0.1.1)
mini_mime (1.0.2)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest (5.14.3)
nested_form (0.3.2)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
Expand All @@ -105,8 +116,8 @@ GEM
pg (0.19.0)
powerpack (0.1.1)
puma (3.6.0)
rack (1.6.4)
rack-pjax (1.0.0)
rack (1.6.13)
rack-pjax (1.1.0)
nokogiri (~> 1.5)
rack (>= 1.1)
rack-test (0.6.3)
Expand All @@ -124,23 +135,23 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_admin (1.0.0)
rails_admin (1.4.3)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
haml (~> 4.0)
haml (>= 4.0, < 6)
jquery-rails (>= 3.0, < 5)
jquery-ui-rails (~> 5.0)
kaminari (~> 0.14)
jquery-ui-rails (>= 5.0, < 7)
kaminari (>= 0.14, < 2.0)
nested_form (~> 0.3)
rack-pjax (>= 0.7)
rails (>= 4.0, < 6)
Expand All @@ -154,8 +165,11 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
rake (11.3.0)
remotipart (1.3.1)
rake (13.0.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
remotipart (1.4.4)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rubocop (0.43.0)
Expand All @@ -166,7 +180,11 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.8.1)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand All @@ -182,21 +200,21 @@ GEM
activesupport (>= 3.0.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
term-ansicolor (1.4.0)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.10)
tins (1.12.0)
tzinfo (1.2.2)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
Expand Down