mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
Merge pull request #4 from differentreality/gemfile
This commit is contained in:
Henne Vogelsang
commit
dc0560b848
3 changed files with 75 additions and 16 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -22,3 +22,6 @@ capybara-*.html
|
|||
**.orig
|
||||
rerun.txt
|
||||
pickle-email-*.html
|
||||
*~
|
||||
/public/assets
|
||||
/bundle
|
||||
|
|
|
|||
29
Gemfile
29
Gemfile
|
|
@ -5,9 +5,6 @@ gem 'rails', '3.2.11'
|
|||
# Bundle edge Rails instead:
|
||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||
|
||||
gem 'sqlite3'
|
||||
gem 'mysql2'
|
||||
|
||||
# Gems used only for assets and not required
|
||||
# in production environments by default.
|
||||
group :assets do
|
||||
|
|
@ -15,7 +12,7 @@ group :assets do
|
|||
# gem 'coffee-rails', '~> 3.2.1'
|
||||
|
||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||
# gem 'therubyracer', :platforms => :ruby
|
||||
gem 'therubyracer', :platforms => :ruby
|
||||
|
||||
gem 'uglifier', '>= 1.2.2'
|
||||
end
|
||||
|
|
@ -37,15 +34,15 @@ gem 'acts_as_commentable_with_threading'
|
|||
gem 'prawn'
|
||||
gem 'prawn_rails'
|
||||
gem 'gravtastic'
|
||||
|
||||
# To use Jbuilder templates for JSON
|
||||
# gem 'jbuilder'
|
||||
|
||||
# Use unicorn as the app server
|
||||
# gem 'unicorn'
|
||||
|
||||
# Deploy with Capistrano
|
||||
# gem 'capistrano'
|
||||
|
||||
# To use debugger
|
||||
# gem 'debugger'
|
||||
group :development, :test do
|
||||
gem 'pry'
|
||||
gem 'sqlite3'
|
||||
gem 'thin'
|
||||
gem 'rspec-rails', '2.11.0'
|
||||
end
|
||||
group :production do
|
||||
gem 'mysql2'
|
||||
end
|
||||
group :test do
|
||||
gem 'capybara', '1.1.2'
|
||||
end
|
||||
|
|
|
|||
59
Gemfile.lock
59
Gemfile.lock
|
|
@ -40,19 +40,33 @@ GEM
|
|||
bcrypt-ruby (3.0.1)
|
||||
builder (3.0.4)
|
||||
cancan (1.6.10)
|
||||
capybara (1.1.2)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
selenium-webdriver (~> 2.0)
|
||||
xpath (~> 0.1.4)
|
||||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
climate_control (0.0.3)
|
||||
activesupport (>= 3.0)
|
||||
cocaine (0.5.1)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
cocoon (1.1.2)
|
||||
coderay (1.0.9)
|
||||
daemons (1.1.9)
|
||||
devise (2.2.4)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (~> 3.1)
|
||||
warden (~> 1.2.1)
|
||||
diff-lcs (1.1.3)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
ffi (1.9.0)
|
||||
formtastic (2.2.1)
|
||||
actionpack (>= 3.0)
|
||||
formtastic-bootstrap (2.1.1)
|
||||
|
|
@ -71,13 +85,18 @@ GEM
|
|||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.0)
|
||||
libv8 (3.11.8.17)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
method_source (0.8.1)
|
||||
mime-types (1.23)
|
||||
mini_portile (0.5.0)
|
||||
multi_json (1.7.3)
|
||||
mysql2 (0.3.11)
|
||||
nokogiri (1.6.0)
|
||||
mini_portile (~> 0.5.0)
|
||||
orm_adapter (0.4.0)
|
||||
paper_trail (2.7.1)
|
||||
activerecord (~> 3.0)
|
||||
|
|
@ -101,6 +120,10 @@ GEM
|
|||
prawn_rails (0.0.11)
|
||||
prawn (>= 0.11.1)
|
||||
railties (>= 3.0.0)
|
||||
pry (0.9.12.2)
|
||||
coderay (~> 1.0.5)
|
||||
method_source (~> 0.8)
|
||||
slop (~> 3.4)
|
||||
rack (1.4.5)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
|
|
@ -126,18 +149,46 @@ GEM
|
|||
rake (10.0.4)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
ref (1.0.5)
|
||||
rspec (2.11.0)
|
||||
rspec-core (~> 2.11.0)
|
||||
rspec-expectations (~> 2.11.0)
|
||||
rspec-mocks (~> 2.11.0)
|
||||
rspec-core (2.11.1)
|
||||
rspec-expectations (2.11.3)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-mocks (2.11.3)
|
||||
rspec-rails (2.11.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec (~> 2.11.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
rubyzip (0.9.9)
|
||||
sass (3.2.5)
|
||||
sass-rails (3.2.5)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
selenium-webdriver (2.33.0)
|
||||
childprocess (>= 0.2.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip
|
||||
websocket (~> 1.0.4)
|
||||
slop (3.4.5)
|
||||
sprockets (2.2.2)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sqlite3 (1.3.7)
|
||||
therubyracer (0.11.4)
|
||||
libv8 (~> 3.11.8.12)
|
||||
ref
|
||||
thin (1.5.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.18.1)
|
||||
tilt (1.4.1)
|
||||
transitions (0.1.8)
|
||||
|
|
@ -151,7 +202,10 @@ GEM
|
|||
multi_json (~> 1.0, >= 1.0.2)
|
||||
warden (1.2.1)
|
||||
rack (>= 1.0)
|
||||
websocket (1.0.7)
|
||||
will_paginate (3.0.4)
|
||||
xpath (0.1.4)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -160,6 +214,7 @@ DEPENDENCIES
|
|||
acts_as_commentable_with_threading
|
||||
bcrypt-ruby (~> 3.0.0)
|
||||
cancan
|
||||
capybara (= 1.1.2)
|
||||
cocoon
|
||||
devise
|
||||
formtastic-bootstrap
|
||||
|
|
@ -172,9 +227,13 @@ DEPENDENCIES
|
|||
paperclip (~> 3.0)
|
||||
prawn
|
||||
prawn_rails
|
||||
pry
|
||||
rails (= 3.2.11)
|
||||
rspec-rails (= 2.11.0)
|
||||
sass-rails (~> 3.2.3)
|
||||
sqlite3
|
||||
therubyracer
|
||||
thin
|
||||
transitions
|
||||
uglifier (>= 1.2.2)
|
||||
will_paginate
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue