Skip to content

Commit

Permalink
Update Gemfile and and Gemfile.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
Brice Sanchez committed Jun 6, 2016
1 parent 5cc69e7 commit 6b64ce8
Show file tree
Hide file tree
Showing 2 changed files with 301 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ gem 'refinerycms-acts-as-indexed', ['~> 2.0', '>= 2.0.0']
gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.6']

# Database Configuration
unless ENV['TRAVIS']
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc1', platform: :jruby
gem 'sqlite3', platform: :ruby
if !ENV['TRAVIS']
group :development do
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc1', platform: :jruby
gem 'sqlite3', platform: :ruby
end
end

if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
Expand All @@ -33,7 +35,7 @@ if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
end
end

if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
if !ENV['TRAVIS'] || ENV['DB'] != 'mysql'
group :postgres, :postgresql do
gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.rc1', platform: :jruby
gem 'pg', platform: :ruby
Expand Down
295 changes: 295 additions & 0 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
PATH
remote: ./
specs:
refinerycms (3.0.3)
refinerycms-core (= 3.0.3)
refinerycms-images (= 3.0.3)
refinerycms-pages (= 3.0.3)
refinerycms-resources (= 3.0.3)
refinerycms-core (3.0.3)
actionpack (>= 4.2.3, < 5.0)
activerecord (>= 4.2.3, < 5.0)
awesome_nested_set (~> 3.0.0)
bootstrap (~> 4.0.0.alpha3)
coffee-rails (~> 4.0, >= 4.0.0)
decorators (~> 2.0.0)
font-awesome-sass (>= 4.3.0, < 5.0)
jquery-rails (>= 2.3.0)
jquery-ui-rails (~> 5.0.0)
railties (>= 4.2.3, < 5.0)
refinerycms-i18n (~> 3.0.0)
sass-rails (>= 4.0, < 5.1)
truncate_html (~> 0.9)
will_paginate (~> 3.0.2)
zilch-authorisation
refinerycms-images (3.0.3)
dragonfly (~> 1.0.0)
globalize (>= 4.0.0, < 5.2)
refinerycms-core (= 3.0.3)
refinerycms-pages (3.0.3)
awesome_nested_set (~> 3.0.0)
babosa (!= 0.3.6)
diffy (~> 3.1.0)
friendly_id (>= 5.1.0, < 5.3)
globalize (>= 4.0.0, < 5.2)
refinerycms-core (= 3.0.3)
seo_meta (~> 2.0.0.rc.1)
speakingurl-rails (~> 8.0.0)
refinerycms-resources (3.0.3)
acts_as_indexed (~> 0.8.0)
dragonfly (~> 1.0.0)
globalize (>= 4.0.0, < 5.2)
refinerycms-core (= 3.0.3)

PATH
remote: ./testing
specs:
refinerycms-testing (3.0.3)
capybara (~> 2.4.3)
database_cleaner (~> 1.3.0)
factory_girl_rails (~> 4.6.0)
refinerycms-core (= 3.0.3)
rspec-rails (~> 3.0)

GEM
remote: https://rubygems.org/
specs:
actionpack (4.2.6)
actionview (= 4.2.6)
activesupport (= 4.2.6)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activemodel (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
activerecord (4.2.6)
activemodel (= 4.2.6)
activesupport (= 4.2.6)
arel (~> 6.0)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
acts_as_indexed (0.8.3)
addressable (2.4.0)
arel (6.0.3)
autoprefixer-rails (6.3.6.2)
execjs
awesome_nested_set (3.0.3)
activerecord (>= 4.0.0, < 5)
babosa (1.0.2)
bootstrap (4.0.0.alpha3)
autoprefixer-rails (>= 6.0.3)
sass (>= 3.4.19)
builder (3.2.2)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
cliver (0.3.2)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
concurrent-ruby (1.0.2)
coveralls (0.8.13)
json (~> 1.8)
simplecov (~> 0.11.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
tins (~> 1.6.0)
database_cleaner (1.3.0)
decorators (2.0.1)
railties (>= 4.0.0, < 5.0.0)
diff-lcs (1.2.5)
diffy (3.1.0)
docile (1.1.5)
dragonfly (1.0.12)
addressable (~> 2.3)
multi_json (~> 1.0)
rack (>= 1.3.0)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.6.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
font-awesome-sass (4.6.2)
sass (>= 3.2)
friendly_id (5.1.0)
activerecord (>= 4.0.0)
generator_spec (0.9.3)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
globalize (5.0.1)
activemodel (>= 4.2.0, < 4.3)
activerecord (>= 4.2.0, < 4.3)
i18n (0.7.0)
jquery-rails (4.1.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.0.0)
minitest (5.9.0)
multi_json (1.12.1)
mysql2 (0.3.21)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
poltergeist (1.9.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
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-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-i18n (4.0.8)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
refinerycms-acts-as-indexed (2.0.1)
acts_as_indexed (~> 0.8.0)
decorators (~> 2.0.0)
refinerycms-core (~> 3.0.0)
refinerycms-i18n (3.0.1)
rails-i18n (~> 4.0.1)
routing-filter (>= 0.4.0)
refinerycms-wymeditor (1.0.6)
refinerycms-core (~> 3.0, >= 3.0.0)
routing-filter (0.5.1)
actionpack (~> 4.2)
activesupport (~> 4.2)
rspec-core (3.4.4)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.4.0)
rspec-rails (3.4.2)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-retry (0.4.5)
rspec-core
rspec-support (3.4.1)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
seo_meta (2.0.0.rc.1)
railties (>= 3.0.0)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
speakingurl-rails (8.0.2)
railties (>= 3.1)
spring (1.7.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.11)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.5)
tins (1.6.0)
truncate_html (0.9.3)
tzinfo (1.2.2)
thread_safe (~> 0.1)
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
will_paginate (3.0.7)
xpath (2.0.0)
nokogiri (~> 1.3)
zilch-authorisation (0.0.1)

PLATFORMS
ruby

DEPENDENCIES
activerecord-jdbcmysql-adapter (>= 1.3.0.rc1)
activerecord-jdbcpostgresql-adapter (>= 1.3.0.rc1)
activerecord-jdbcsqlite3-adapter (>= 1.3.0.rc1)
coveralls
generator_spec (~> 0.9.3)
launchy
mysql2 (~> 0.3.18)
pg
poltergeist (>= 1.8.1)
quiet_assets
refinerycms!
refinerycms-acts-as-indexed (~> 2.0, >= 2.0.0)
refinerycms-core!
refinerycms-images!
refinerycms-pages!
refinerycms-resources!
refinerycms-testing!
refinerycms-wymeditor (~> 1.0, >= 1.0.6)
rspec-retry
spring
spring-commands-rspec
sqlite3

BUNDLED WITH
1.10.5

0 comments on commit 6b64ce8

Please sign in to comment.