Update of activeadmin (1.0.rc)
Use sass-rails git master, otherwise sass 3.3 is not supported.
This commit is contained in:
Saverio Trioni
6
Gemfile
6
Gemfile
@ -1,6 +1,6 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '>= 4.0.0'
|
||||
gem 'rails', '~> 4.1'
|
||||
gem 'rails-i18n'
|
||||
gem 'rails_12factor'
|
||||
gem "rdiscount"
|
||||
@ -18,7 +18,7 @@ gem 'hstore_translate'
|
||||
|
||||
gem 'dalli'
|
||||
|
||||
gem 'sass-rails'
|
||||
gem 'sass-rails', github: 'rails/sass-rails'
|
||||
# gem 'compass-rails'
|
||||
gem 'coffee-rails'
|
||||
gem 'ngannotate-rails'
|
||||
@ -41,7 +41,7 @@ gem 'textacular', "~> 3.0", require: 'textacular/rails'
|
||||
gem "haml-rails"
|
||||
gem 'turbolinks'
|
||||
|
||||
gem "simple_form", "~> 3.0.0"
|
||||
gem "simple_form", ">= 3.0.0"
|
||||
|
||||
gem "awesome_print"
|
||||
gem "jbuilder"
|
||||
|
||||
175
Gemfile.lock
175
Gemfile.lock
@ -1,67 +1,77 @@
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 03c7bc771bf7b166de64848f2dae92368dad6b46
|
||||
revision: b5ce6af4e5538010ff02387be04c2d60b6b62127
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
bourbon
|
||||
coffee-rails
|
||||
devise (~> 3.2)
|
||||
formtastic (~> 2.3.0.rc2)
|
||||
formtastic (~> 2.3.0.rc3)
|
||||
inherited_resources (~> 1.3)
|
||||
jquery-rails
|
||||
jquery-ui-rails
|
||||
kaminari (~> 0.14)
|
||||
rails (>= 3.2, < 4.1)
|
||||
kaminari (~> 0.15)
|
||||
rails (>= 3.2, < 4.2)
|
||||
ransack (~> 1.0)
|
||||
sass-rails
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails/sass-rails.git
|
||||
revision: 3a9e47db7d769221157c82229fc1bade55b580f0
|
||||
specs:
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.2)
|
||||
sprockets (~> 2.12)
|
||||
sprockets-rails (~> 2.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
actionmailer (4.1.1)
|
||||
actionpack (= 4.1.1)
|
||||
actionview (= 4.1.1)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
actionpack (4.1.1)
|
||||
actionview (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.2)
|
||||
activemodel (= 4.0.2)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
actionview (4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.1)
|
||||
activemodel (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
arel (~> 5.0.0)
|
||||
activerecord-postgres-hstore (0.7.6)
|
||||
activerecord (>= 3.1)
|
||||
pg-hstore (>= 1.1.5)
|
||||
rake
|
||||
activesupport (4.0.2)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
activesupport (4.1.1)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
tzinfo (~> 1.1)
|
||||
arbre (1.0.1)
|
||||
activesupport (>= 3.0.0)
|
||||
arel (4.0.1)
|
||||
atomic (1.1.14)
|
||||
arel (5.0.1.20140414130214)
|
||||
awesome_print (1.2.0)
|
||||
bcrypt-ruby (3.1.2)
|
||||
bcrypt (3.1.7)
|
||||
better_errors (1.0.1)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bourbon (3.1.8)
|
||||
sass (>= 3.2.0)
|
||||
bourbon (4.0.2)
|
||||
sass (~> 3.3)
|
||||
thor
|
||||
builder (3.1.4)
|
||||
builder (3.2.2)
|
||||
choice (0.1.6)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.0.1)
|
||||
@ -70,13 +80,13 @@ GEM
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.6.3)
|
||||
coffee-script-source (1.7.0)
|
||||
daemons (1.1.9)
|
||||
dalli (2.6.4)
|
||||
database_cleaner (1.2.0)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.2.2)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
devise (3.2.4)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
thread_safe (~> 0.1)
|
||||
@ -96,15 +106,15 @@ GEM
|
||||
foreman (0.63.0)
|
||||
dotenv (>= 0.7)
|
||||
thor (>= 0.13.6)
|
||||
formtastic (2.3.0.rc2)
|
||||
formtastic (2.3.0.rc3)
|
||||
actionpack (>= 3.0)
|
||||
haml (4.0.3)
|
||||
haml (4.0.5)
|
||||
tilt
|
||||
haml-rails (0.4)
|
||||
actionpack (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
haml (>= 3.1, < 4.1)
|
||||
railties (>= 3.1, < 4.1)
|
||||
haml-rails (0.5.3)
|
||||
actionpack (>= 4.0.1)
|
||||
activesupport (>= 4.0.1)
|
||||
haml (>= 3.1, < 5.0)
|
||||
railties (>= 4.0.1)
|
||||
has_scope (0.6.0.rc)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
@ -122,12 +132,13 @@ GEM
|
||||
jbuilder (1.5.1)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jquery-rails (3.0.4)
|
||||
jquery-rails (3.1.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (4.1.1)
|
||||
railties (>= 3.1.0)
|
||||
kaminari (0.15.0)
|
||||
jquery-ui-rails (4.2.1)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.1)
|
||||
kaminari (0.15.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
mail (2.5.4)
|
||||
@ -135,8 +146,8 @@ GEM
|
||||
treetop (~> 1.4.8)
|
||||
memcachier (0.0.2)
|
||||
mime-types (1.25.1)
|
||||
minitest (4.7.5)
|
||||
multi_json (1.8.2)
|
||||
minitest (5.3.4)
|
||||
multi_json (1.10.1)
|
||||
ngannotate-rails (0.9.2)
|
||||
rails (>= 3.1)
|
||||
orm_adapter (0.5.0)
|
||||
@ -144,45 +155,49 @@ GEM
|
||||
activerecord (~> 4.0)
|
||||
pg (0.17.0)
|
||||
pg-hstore (1.2.0)
|
||||
polyamorous (0.6.4)
|
||||
polyamorous (1.0.0)
|
||||
activerecord (>= 3.0)
|
||||
polyglot (0.3.3)
|
||||
polyglot (0.3.4)
|
||||
pundit (0.2.1)
|
||||
activesupport (>= 3.0.0)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.2)
|
||||
actionmailer (= 4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activerecord (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
rails (4.1.1)
|
||||
actionmailer (= 4.1.1)
|
||||
actionpack (= 4.1.1)
|
||||
actionview (= 4.1.1)
|
||||
activemodel (= 4.1.1)
|
||||
activerecord (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.2)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
railties (= 4.1.1)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-erd (1.1.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
choice (~> 0.1.6)
|
||||
ruby-graphviz (~> 1.0.4)
|
||||
rails-i18n (4.0.0)
|
||||
rails-i18n (4.0.2)
|
||||
i18n (~> 0.6)
|
||||
rails (~> 4.0.0)
|
||||
rails (>= 4.0)
|
||||
rails_12factor (0.0.2)
|
||||
rails_serve_static_assets
|
||||
rails_stdout_logging
|
||||
rails_serve_static_assets (0.0.1)
|
||||
rails_stdout_logging (0.0.3)
|
||||
railties (4.0.2)
|
||||
actionpack (= 4.0.2)
|
||||
activesupport (= 4.0.2)
|
||||
railties (4.1.1)
|
||||
actionpack (= 4.1.1)
|
||||
activesupport (= 4.1.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.1)
|
||||
ransack (1.1.0)
|
||||
rake (10.3.2)
|
||||
ransack (1.2.3)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
polyamorous (~> 0.6.0)
|
||||
activesupport (>= 3.0)
|
||||
i18n
|
||||
polyamorous (~> 1.0.0)
|
||||
rdiscount (2.1.7)
|
||||
responders (1.0.0)
|
||||
railties (>= 3.2, < 5)
|
||||
@ -202,18 +217,14 @@ GEM
|
||||
rspec-expectations (~> 2.13.0)
|
||||
rspec-mocks (~> 2.13.0)
|
||||
ruby-graphviz (1.0.9)
|
||||
sass (3.2.13)
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
sass (3.3.7)
|
||||
shelly-dependencies (0.2.3)
|
||||
rake
|
||||
thin
|
||||
simple_form (3.0.0)
|
||||
actionpack (>= 4.0.0, < 4.1)
|
||||
activemodel (>= 4.0.0, < 4.1)
|
||||
sprockets (2.10.1)
|
||||
simple_form (3.0.2)
|
||||
actionpack (~> 4.0)
|
||||
activemodel (~> 4.0)
|
||||
sprockets (2.12.1)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
@ -222,15 +233,14 @@ GEM
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
textacular (3.1.0)
|
||||
activerecord (>= 3.0, < 4.1)
|
||||
textacular (3.2.0)
|
||||
activerecord (>= 3.0, < 4.2)
|
||||
thin (1.6.2)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.3)
|
||||
atomic
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.3)
|
||||
tilt (1.4.1)
|
||||
travis-lint (1.7.0)
|
||||
hashr (~> 0.0.22)
|
||||
@ -239,7 +249,8 @@ GEM
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.3.0)
|
||||
coffee-rails
|
||||
tzinfo (0.3.38)
|
||||
tzinfo (1.1.0)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.2.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
@ -275,7 +286,7 @@ DEPENDENCIES
|
||||
paranoia
|
||||
pg
|
||||
pundit
|
||||
rails (>= 4.0.0)
|
||||
rails (~> 4.1)
|
||||
rails-erd
|
||||
rails-i18n
|
||||
rails_12factor
|
||||
@ -284,9 +295,9 @@ DEPENDENCIES
|
||||
rest-client
|
||||
rollbar
|
||||
rspec-rails
|
||||
sass-rails
|
||||
sass-rails!
|
||||
shelly-dependencies
|
||||
simple_form (~> 3.0.0)
|
||||
simple_form (>= 3.0.0)
|
||||
textacular (~> 3.0)
|
||||
thin
|
||||
travis-lint
|
||||
|
||||
@ -4,7 +4,7 @@ ActiveAdmin.register Category do
|
||||
selectable_column
|
||||
id_column
|
||||
column :name, sortable: false
|
||||
default_actions
|
||||
actions
|
||||
end
|
||||
|
||||
form do |f|
|
||||
|
||||
@ -7,7 +7,7 @@ ActiveAdmin.register Document do
|
||||
column :documentable
|
||||
column :label
|
||||
column :title
|
||||
default_actions
|
||||
actions
|
||||
end
|
||||
|
||||
show do |t|
|
||||
|
||||
@ -9,7 +9,7 @@ ActiveAdmin.register Offer do
|
||||
column :user
|
||||
column :category
|
||||
column :tag_list
|
||||
default_actions
|
||||
actions
|
||||
end
|
||||
|
||||
form do |f|
|
||||
@ -29,4 +29,4 @@ ActiveAdmin.register Offer do
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@ -6,7 +6,7 @@ ActiveAdmin.register Organization do
|
||||
column :updated_at
|
||||
# column :email
|
||||
# column :domain
|
||||
default_actions
|
||||
actions
|
||||
end
|
||||
|
||||
form do |f|
|
||||
|
||||
@ -10,7 +10,7 @@ ActiveAdmin.register User do
|
||||
column :organizations do |u|
|
||||
u.organizations.map(&:to_s).join(", ")
|
||||
end
|
||||
default_actions
|
||||
actions
|
||||
end
|
||||
|
||||
filter :organizations
|
||||
|
||||
Reference in New Issue
Block a user