Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:sferik/rails_admin

  • Loading branch information...
commit e17434dab04d9ffbb574862d9c2a06fe9013c756 2 parents 468a146 + 1a3969b
Benoit Bénézech bbenezech authored
Showing with 7 additions and 7 deletions.
  1. +0 −1  .gitignore
  2. +5 −6 Gemfile
  3. +2 −0  rails_admin.gemspec
1  .gitignore
View
@@ -2,7 +2,6 @@
*.log
*.rbc
*.swp
-.DS_Store
.bundle
.idea/
.rvmrc
11 Gemfile
View
@@ -45,12 +45,6 @@ group :mongoid do
gem 'mongoid-paperclip', :require => 'mongoid_paperclip'
end
-group :development, :test do
- gem 'cancan'
- gem 'dragonfly'
- gem 'paperclip', '~> 2.7'
-end
-
group :debug do
platform :mri_18 do
gem 'ruby-debug'
@@ -71,4 +65,9 @@ platforms :jruby, :mingw_18, :ruby_18 do
gem 'fastercsv', '~> 1.5'
end
+group :development, :test do
+ gem 'cancan'
+ gem 'paperclip', '~> 2.7'
+end
+
gemspec
2  rails_admin.gemspec
View
@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
gem.add_dependency 'rack-pjax', '~> 0.5'
gem.add_dependency 'rails', '~> 3.1'
gem.add_dependency 'remotipart', '~> 1.0'
+ gem.add_development_dependency 'cancan'
gem.add_development_dependency 'capybara'
gem.add_development_dependency 'carrierwave'
gem.add_development_dependency 'database_cleaner'
@@ -24,6 +25,7 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'generator_spec'
gem.add_development_dependency 'launchy'
gem.add_development_dependency 'mini_magick'
+ gem.add_development_dependency 'paperclip', '~> 2.7'
gem.add_development_dependency 'rspec-rails'
gem.add_development_dependency 'timecop'
gem.authors = ["Erik Michaels-Ober", "Bogdan Gaza", "Petteri Kaapa", "Benoit Benezech"]
Please sign in to comment.
Something went wrong with that request. Please try again.