Skip to content

Mise à jour BaseApp Rails 3.1 rc4 #1

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

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

Mise à jour BaseApp Rails 3.1 rc4 #1

Show file tree
Hide file tree
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
22 changes: 14 additions & 8 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
source 'http://rubygems.org'

gem 'rails', '3.1.0.rc1'
gem 'rails', '3.1.0.rc4'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'mysql2'

# Asset template engines
gem 'json'
gem 'sass'
gem 'haml'
gem 'coffee-script'
gem 'uglifier'

gem 'jquery-rails'

gem 'devise', '1.1.4'

gem 'haml-rails'
gem 'sass-rails', "~> 3.1.0.rc"

gem 'devise'
gem 'cancan'

gem 'will_paginate', :git => 'git://github.com/JackDanger/will_paginate.git'

gem 'paperclip'

# gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
# Admin
# gem 'meta_search', '>= 1.1.0.pre'
# gem 'activeadmin', :git => 'https://github.com/gregbell/active_admin.git'

# Use unicorn as the web server
# gem 'unicorn'
Expand All @@ -32,5 +34,9 @@ gem 'paperclip'
# gem 'capistrano'

# To use debugger
# gem 'ruby-debug'
# gem 'ruby-debug19', :require => 'ruby-debug'

group :test do
# Pretty printed test output
gem 'turn', :require => false
end
149 changes: 100 additions & 49 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,111 @@ GIT
specs:
will_paginate (2.3.15)

GIT
remote: https://github.com/gregbell/active_admin.git
revision: 811f286fda3b6dfa91aa172b2471ee56346d539d
specs:
activeadmin (0.2.2)
devise (>= 1.1.2)
fastercsv
formtastic (>= 1.1.0)
inherited_resources
kaminari (>= 0.12.4)
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.1.0.rc1)
actionpack (= 3.1.0.rc1)
actionmailer (3.1.0.rc4)
actionpack (= 3.1.0.rc4)
mail (~> 2.3.0)
actionpack (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
actionpack (3.1.0.rc4)
activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6.0beta1)
rack (~> 1.3.0.beta2)
i18n (~> 0.6)
rack (~> 1.3.0)
rack-cache (~> 1.0.1)
rack-mount (~> 0.8.1)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.5)
sprockets (~> 2.0.0.beta.10)
tzinfo (~> 0.3.27)
activemodel (3.1.0.rc1)
activesupport (= 3.1.0.rc1)
activemodel (3.1.0.rc4)
activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
i18n (~> 0.6.0beta1)
activerecord (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
i18n (~> 0.6)
activerecord (3.1.0.rc4)
activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
arel (~> 2.1.1)
tzinfo (~> 0.3.27)
activeresource (3.1.0.rc1)
activemodel (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
activesupport (3.1.0.rc1)
activeresource (3.1.0.rc4)
activemodel (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
activesupport (3.1.0.rc4)
multi_json (~> 1.0)
arel (2.1.1)
ansi (1.3.0)
arel (2.1.3)
bcrypt-ruby (2.1.4)
builder (3.0.0)
cancan (1.6.5)
cocaine (0.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.1)
devise (1.1.4)
devise (1.4.2)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
erubis (2.7.0)
execjs (1.1.0)
execjs (1.2.0)
multi_json (~> 1.0)
haml (3.1.1)
hike (1.0.0)
fastercsv (1.5.4)
formtastic (1.2.4)
actionpack (>= 2.3.7)
activesupport (>= 2.3.7)
i18n (~> 0.4)
haml (3.1.2)
haml-rails (0.3.4)
actionpack (~> 3.0)
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
has_scope (0.5.0)
hike (1.2.0)
i18n (0.6.0)
jquery-rails (1.0.9)
inherited_resources (1.2.2)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
jquery-rails (1.0.12)
railties (~> 3.0)
thor (~> 0.14)
json (1.5.1)
kaminari (0.12.4)
rails (>= 3.0.0)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_search (1.1.0.pre2)
actionpack (~> 3.1.0.alpha)
activerecord (~> 3.1.0.alpha)
activesupport (~> 3.1.0.alpha)
mime-types (1.16)
multi_json (1.0.3)
mysql2 (0.3.2)
paperclip (2.3.11)
mysql2 (0.3.6)
orm_adapter (0.0.5)
paperclip (2.3.15)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
polyglot (0.3.1)
rack (1.3.0)
rack (1.3.1)
rack-cache (1.0.2)
rack (>= 0.4)
rack-mount (0.8.1)
Expand All @@ -78,32 +117,42 @@ GEM
rack
rack-test (0.6.0)
rack (>= 1.0)
rails (3.1.0.rc1)
actionmailer (= 3.1.0.rc1)
actionpack (= 3.1.0.rc1)
activerecord (= 3.1.0.rc1)
activeresource (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
rails (3.1.0.rc4)
actionmailer (= 3.1.0.rc4)
actionpack (= 3.1.0.rc4)
activerecord (= 3.1.0.rc4)
activeresource (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
bundler (~> 1.0)
railties (= 3.1.0.rc1)
railties (3.1.0.rc1)
actionpack (= 3.1.0.rc1)
activesupport (= 3.1.0.rc1)
railties (= 3.1.0.rc4)
railties (3.1.0.rc4)
actionpack (= 3.1.0.rc4)
activesupport (= 3.1.0.rc4)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.1)
sass (3.1.2)
sprockets (2.0.0.beta.9)
rake (0.9.2)
rdoc (3.8)
responders (0.6.4)
sass (3.1.4)
sass-rails (3.1.0.rc.4)
actionpack (~> 3.1.0.rc1)
railties (~> 3.1.0.rc1)
sass (>= 3.1.4)
sprockets (>= 2.0.0.beta.9)
sprockets (2.0.0.beta.10)
hike (~> 1.0)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
thor (0.14.6)
tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.27)
uglifier (0.5.4)
turn (0.8.2)
ansi (>= 1.2.2)
tzinfo (0.3.29)
uglifier (1.0.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.0.4)
Expand All @@ -113,15 +162,17 @@ PLATFORMS
ruby

DEPENDENCIES
activeadmin!
cancan
coffee-script
devise (= 1.1.4)
haml
devise
haml-rails
jquery-rails
json
meta_search (>= 1.1.0.pre)
mysql2
paperclip
rails (= 3.1.0.rc1)
sass
rails (= 3.1.0.rc4)
sass-rails (~> 3.1.0.rc)
turn
uglifier
will_paginate!
Loading