Site
/
clarion
11
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #17 from ignisf/update-bundle 

Bump Rails to 4.2.3 and update the bundle
This commit is contained in:
Petko Bordjukov 2015-07-19 15:02:26 +03:00
parent 8d744299ab f2a6d788dd
commit 9766034c78
2 changed files with 86 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '4.2.1'
gem 'rails', '4.2.3'
gem 'sqlite3'
gem 'pg'

174
Gemfile.lock
View File

@ -8,53 +8,53 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
actionmailer (4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.1)
actionview (= 4.2.1)
activesupport (= 4.2.1)
actionpack (4.2.3)
actionview (= 4.2.3)
activesupport (= 4.2.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1)
activesupport (= 4.2.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1)
activesupport (= 4.2.1)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.3)
activesupport (= 4.2.3)
globalid (>= 0.3.0)
activemodel (4.2.1)
activesupport (= 4.2.1)
activemodel (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
activerecord (4.2.1)
activemodel (= 4.2.1)
activesupport (= 4.2.1)
activerecord (4.2.3)
activemodel (= 4.2.3)
activesupport (= 4.2.3)
arel (~> 6.0)
activesupport (4.2.1)
activesupport (4.2.3)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
autoprefixer-rails (5.2.0)
arel (6.0.2)
autoprefixer-rails (5.2.1.1)
execjs
json
awesome_print (1.6.1)
bcrypt (3.1.10)
bootstrap-sass (3.3.4.1)
bootstrap-sass (3.3.5.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
sass (>= 3.3.0)
bootstrap-sass-extras (0.0.6)
rails (>= 3.1.0)
bootswatch-rails (3.3.4)
bootswatch-rails (3.3.5)
railties (>= 3.1)
builder (3.2.2)
capistrano (3.4.0)
@ -81,8 +81,6 @@ GEM
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
celluloid (0.16.0)
timers (~> 4.0.0)
choice (0.2.0)
coderay (1.1.0)
coffee-rails (4.1.0)
@ -93,7 +91,7 @@ GEM
execjs
coffee-script-source (1.9.1.1)
colorize (0.7.7)
countries (0.11.4)
countries (0.11.5)
currencies (~> 0.4.2)
i18n_data (~> 0.7.0)
currencies (0.4.2)
@ -104,7 +102,7 @@ GEM
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-i18n (0.12.0)
devise-i18n (0.12.1)
diff-lcs (1.2.5)
docile (1.1.5)
easy_translate (0.5.0)
@ -120,7 +118,7 @@ GEM
railties (>= 3.0.0)
faker (1.4.3)
i18n (~> 0.5)
ffi (1.9.8)
ffi (1.9.10)
font-awesome-sass (4.3.2.1)
sass (~> 3.2)
formatador (0.2.5)
@ -129,9 +127,9 @@ GEM
globalize (5.0.1)
activemodel (>= 4.2.0, < 4.3)
activerecord (>= 4.2.0, < 4.3)
guard (2.12.5)
guard (2.12.8)
formatador (>= 0.2.4)
listen (~> 2.7)
listen (>= 2.7, <= 4.0)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
@ -139,36 +137,34 @@ GEM
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-rspec (4.5.1)
guard-rspec (4.6.2)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
highline (1.7.2)
hirb (0.7.3)
hitimes (1.2.2)
i18n (0.7.0)
i18n-tasks (0.8.3)
i18n-tasks (0.8.5)
activesupport
easy_translate (>= 0.5.0)
erubis
highline
i18n
term-ansicolor
terminal-table
terminal-table (>= 1.5.1)
i18n_data (0.7.0)
jquery-datatables-rails (3.3.0)
actionpack (>= 3.1)
jquery-rails
railties (>= 3.1)
sass-rails
jquery-rails (4.0.3)
jquery-rails (4.0.4)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
libv8 (3.16.14.7)
listen (2.10.0)
celluloid (~> 0.16.0)
json (1.8.3)
libv8 (3.16.14.11)
listen (3.0.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.0.2)
@ -194,10 +190,10 @@ GEM
shellany (~> 0.0)
orm_adapter (0.5.0)
pg (0.18.2)
phony (2.14.1)
phony_rails (0.12.6)
phony (2.14.10)
phony_rails (0.12.9)
activesupport (>= 3.0)
countries (~> 0.8, >= 0.8.2)
countries (~> 0.11, >= 0.11.5)
phony (~> 2.12)
pry (0.10.1)
coderay (~> 1.1.0)
@ -205,23 +201,22 @@ GEM
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
puma (2.11.3)
rack (>= 1.1, < 2.0)
puma (2.12.2)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.1)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.1)
actionmailer (= 4.2.1)
actionpack (= 4.2.1)
actionview (= 4.2.1)
activejob (= 4.2.1)
activemodel (= 4.2.1)
activerecord (= 4.2.1)
activesupport (= 4.2.1)
rails (4.2.3)
actionmailer (= 4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
activemodel (= 4.2.3)
activerecord (= 4.2.3)
activesupport (= 4.2.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.1)
railties (= 4.2.3)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@ -229,7 +224,7 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.4.0)
rails-erd (1.4.1)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
@ -239,9 +234,9 @@ GEM
rails-i18n (4.0.4)
i18n (~> 0.6)
railties (~> 4.0)
railties (4.2.1)
actionpack (= 4.2.1)
activesupport (= 4.2.1)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
@ -249,33 +244,33 @@ GEM
rb-fsevent (0.9.5)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
ref (1.0.5)
ref (2.0.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rmagick (2.15.0)
rspec (3.2.0)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
rmagick (2.15.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-mocks (3.2.1)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.2.0)
rspec-rails (3.2.1)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.2.0)
rspec-expectations (~> 3.2.0)
rspec-mocks (~> 3.2.0)
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
ruby-graphviz (1.2.2)
sass (3.4.14)
sass (3.4.16)
sass-rails (5.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
@ -291,7 +286,7 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slim (3.0.3)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
slim-rails (3.0.1)
@ -304,9 +299,9 @@ GEM
spring (1.3.6)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.1.0)
sprockets (3.2.0)
rack (~> 1.0)
sprockets-rails (2.3.1)
sprockets-rails (2.3.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@ -315,20 +310,18 @@ GEM
colorize (>= 0.7.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
temple (0.7.5)
term-ansicolor (1.3.0)
temple (0.7.6)
term-ansicolor (1.3.2)
tins (~> 1.0)
terminal-table (1.4.5)
terminal-table (1.5.2)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread (0.2.0)
thread (0.2.2)
thread_safe (0.3.5)
tilt (1.4.1)
timers (4.0.1)
hitimes
tins (1.5.2)
tins (1.5.4)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.1)
@ -372,7 +365,7 @@ DEPENDENCIES
pry-rails
puma
quiet_assets
rails (= 4.2.1)
rails (= 4.2.3)
rails-erd
rails-i18n
raphael-rails
@ -388,3 +381,6 @@ DEPENDENCIES
therubyracer
uglifier
yaml_db!
BUNDLED WITH
1.10.5