Skip to content

Commit

Permalink
udpated gems
Browse files Browse the repository at this point in the history
  • Loading branch information
@cofiem
cofiem committed Jan 27, 2016
1 parent b30ee7a commit e1ea839
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 68 deletions.
12 changes: 6 additions & 6 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ gem 'coffee-rails', '~> 4.1.0'
gem 'therubyracer', '~> 0.12.1', platforms: :ruby, require: 'v8'

# Use jquery as the JavaScript library
gem 'jquery-rails', '~> 4.0.0'
gem 'jquery-rails', '~> 4.1.0'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
#gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.3.0'
gem 'jbuilder', '~> 2.4.0'

gem 'haml', '~> 4.0.6'
gem 'haml-rails', '~> 0.9.0'
Expand All @@ -59,7 +59,7 @@ gem 'font-awesome-sass', '~> 4.5.0'
# for rails 3, 4
gem 'kaminari'
gem 'dotiw','~> 3.0.1'
gem 'recaptcha', '~> 1.0.2', require: 'recaptcha/rails'
gem 'recaptcha', '~> 1.1.0', require: 'recaptcha/rails'

# for proper timezone support
gem 'tzinfo', '~> 1.2.2'
Expand Down Expand Up @@ -145,7 +145,7 @@ group :development, :test do

gem 'rack-mini-profiler', '~> 0.9.2'
gem 'i18n-tasks', '~> 0.9.0'
gem 'bullet', '~> 4.14.1'
gem 'bullet', '~> 5.0.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
#gem 'spring', '~> 1.4.0'
Expand All @@ -162,7 +162,7 @@ group :development, :test do
gem 'guard', '~> 2.13.0'
gem 'guard-rspec', '~> 4.6.0'
gem 'guard-yard', '~> 2.1.4', require: false
gem 'rubocop', '~> 0.35.1', require: false
gem 'rubocop', '~> 0.36.0', require: false
gem 'haml-lint', require: false

gem 'fakeredis', '~> 0.5.0', require: 'fakeredis/rspec'
Expand Down Expand Up @@ -190,7 +190,7 @@ group :development, :test do

gem 'rspec-rails', '~> 3.4.0'
gem 'factory_girl_rails', '~> 4.5.0'
gem 'capybara', '~> 2.5.0'
gem 'capybara', '~> 2.6.1'

gem 'rspec', '~> 3.4.0'
gem 'simplecov', '~> 0.11.1', require: false
Expand Down
121 changes: 59 additions & 62 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,36 +50,36 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
actionmailer (4.2.5.1)
actionpack (= 4.2.5.1)
actionview (= 4.2.5.1)
activejob (= 4.2.5.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
actionpack (4.2.5.1)
actionview (= 4.2.5.1)
activesupport (= 4.2.5.1)
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.5)
activesupport (= 4.2.5)
actionview (4.2.5.1)
activesupport (= 4.2.5.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.5)
activesupport (= 4.2.5)
activejob (4.2.5.1)
activesupport (= 4.2.5.1)
globalid (>= 0.3.0)
activemodel (4.2.5)
activesupport (= 4.2.5)
activemodel (4.2.5.1)
activesupport (= 4.2.5.1)
builder (~> 3.1)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
activerecord (4.2.5.1)
activemodel (= 4.2.5.1)
activesupport (= 4.2.5.1)
arel (~> 6.0)
activesupport (4.2.5)
activesupport (4.2.5.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -88,8 +88,6 @@ GEM
addressable (2.4.0)
arel (6.0.3)
ast (2.2.0)
astrolabe (1.3.1)
parser (~> 2.2)
autoprefixer-rails (6.3.1)
execjs
json
Expand All @@ -98,7 +96,7 @@ GEM
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
builder (3.2.2)
bullet (4.14.10)
bullet (5.0.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0)
cancancan (1.13.1)
Expand All @@ -114,13 +112,14 @@ GEM
newrelic_rpm
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
capistrano-rails (1.1.5)
capistrano-rails (1.1.6)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.5.0)
capybara (2.6.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
Expand Down Expand Up @@ -152,7 +151,7 @@ GEM
safe_yaml (~> 1.0.0)
daemons (1.2.3)
database_cleaner (1.5.1)
devise (3.5.3)
devise (3.5.5)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
Expand All @@ -171,7 +170,7 @@ GEM
json
thread
thread_safe
enumerize (1.1.0)
enumerize (1.1.1)
activesupport (>= 3.2)
erubis (2.7.0)
eventmachine (1.0.9.1)
Expand Down Expand Up @@ -241,12 +240,12 @@ GEM
parser (>= 2.2.3.0)
term-ansicolor (>= 1.3.2)
terminal-table (>= 1.5.1)
jbuilder (2.3.2)
activesupport (>= 3.0.0, < 5)
jbuilder (2.4.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jc-validates_timeliness (3.1.1)
timeliness (~> 0.3.7)
jquery-rails (4.0.5)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -272,7 +271,7 @@ GEM
mime-types (2.99)
mimemagic (0.3.0)
mini_portile2 (2.0.0)
minitest (5.8.3)
minitest (5.8.4)
mono_logger (1.1.0)
multi_json (1.11.2)
mustache (0.99.8)
Expand All @@ -281,8 +280,8 @@ GEM
net-ssh (>= 2.6.5)
net-ssh (3.0.2)
netrc (0.11.0)
newrelic_rpm (3.14.1.311)
nokogiri (1.6.7.1)
newrelic_rpm (3.14.2.312)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
notiffany (0.0.8)
nenv (~> 0.1)
Expand All @@ -294,7 +293,7 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
parser (2.3.0.1)
parser (2.3.0.2)
ast (~> 2.2)
pg (0.18.4)
powerpack (0.1.1)
Expand All @@ -317,38 +316,38 @@ GEM
haml (~> 4.0, >= 4.0.4)
json (~> 1.8, >= 1.8.1)
sinatra (~> 1.3, >= 1.3.0)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
rails (4.2.5.1)
actionmailer (= 4.2.5.1)
actionpack (= 4.2.5.1)
actionview (= 4.2.5.1)
activejob (= 4.2.5.1)
activemodel (= 4.2.5.1)
activerecord (= 4.2.5.1)
activesupport (= 4.2.5.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.5)
railties (= 4.2.5.1)
sprockets-rails
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.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
railties (4.2.5.1)
actionpack (= 4.2.5.1)
activesupport (= 4.2.5.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rainbow (2.1.0)
rake (10.5.0)
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.2.1)
json (~> 1.4)
recaptcha (1.0.2)
recaptcha (1.1.0)
json
redis (3.2.2)
redis-namespace (1.5.2)
Expand All @@ -375,15 +374,15 @@ GEM
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-core (3.4.2)
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.0)
rspec-rails (3.4.1)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
Expand All @@ -397,15 +396,13 @@ GEM
json (~> 1.4, >= 1.4.6)
mustache (~> 0.99, >= 0.99.4)
rspec (>= 3.0.0)
rubocop (0.35.1)
astrolabe (~> 1.3)
parser (>= 2.2.3.0, < 3.0)
rubocop (0.36.0)
parser (>= 2.3.0.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
tins (<= 1.6.0)
ruby-progressbar (1.7.5)
ruby_parser (3.7.2)
ruby_parser (3.7.3)
sexp_processor (~> 4.1)
safe_yaml (1.0.4)
sass (3.4.21)
Expand All @@ -419,7 +416,7 @@ GEM
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
settingslogic (2.0.9)
sexp_processor (4.6.0)
sexp_processor (4.6.1)
shellany (0.0.1)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
Expand All @@ -431,8 +428,8 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.4.6)
rack (~> 1.4)
sinatra (1.4.7)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
slop (3.6.0)
Expand Down Expand Up @@ -498,15 +495,15 @@ DEPENDENCIES
baw-workers!
bcrypt (~> 3.1.9)
bootstrap-sass (~> 3.3.4)
bullet (~> 4.14.1)
bullet (~> 5.0.0)
cancancan (~> 1.13.1)
capistrano (~> 3.4.0)
capistrano-bundler (~> 1.1.3)
capistrano-newrelic (~> 0.0.8)
capistrano-passenger (~> 0.2.0)
capistrano-rails (~> 1.1.2)
capistrano-rvm (~> 0.1.2)
capybara (~> 2.5.0)
capybara (~> 2.6.1)
codeclimate-test-reporter (~> 0.4.5)
coffee-rails (~> 4.1.0)
coveralls (~> 0.8.10)
Expand All @@ -526,9 +523,9 @@ DEPENDENCIES
haml-lint
haml-rails (~> 0.9.0)
i18n-tasks (~> 0.9.0)
jbuilder (~> 2.3.0)
jbuilder (~> 2.4.0)
jc-validates_timeliness (~> 3.1.1)
jquery-rails (~> 4.0.0)
jquery-rails (~> 4.1.0)
json_spec (~> 1.1.4)
kaminari
launchy (~> 2.4.3)
Expand All @@ -542,7 +539,7 @@ DEPENDENCIES
rack-rewrite (~> 1.5.1)
raddocs (~> 0.5.0)
rails (~> 4.2.4)
recaptcha (~> 1.0.2)
recaptcha (~> 1.1.0)
responders (~> 2.1.0)
resque (~> 1.25.2)
resque-job-stats!
Expand All @@ -551,7 +548,7 @@ DEPENDENCIES
rspec (~> 3.4.0)
rspec-rails (~> 3.4.0)
rspec_api_documentation (~> 4.6.0)
rubocop (~> 0.35.1)
rubocop (~> 0.36.0)
sass-rails (~> 5.0.3)
sdoc (~> 0.4.0)
settingslogic (~> 2.0.9)
Expand Down

0 comments on commit e1ea839

Please sign in to comment.