Commit 63e1775
Changed files (2)
Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
ruby '2.2.2'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.0'
+gem 'rails', '~> 4.2'
# Use postgresql as the database for Active Record
gem 'pg'
gem 'sqlite3'
@@ -11,7 +11,7 @@ gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
-gem 'coffee-rails', '~> 4.1.0'
+gem 'coffee-rails', '~> 4.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby
@@ -22,7 +22,7 @@ gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 0.4.0', group: :doc
+gem 'sdoc', '~> 0.4', group: :doc
gem 'foundation-rails'
gem 'email_validator'
gem 'coveralls', require: false
@@ -58,7 +58,7 @@ group :development, :test do
gem 'factory_girl_rails'
gem 'ffaker'
gem 'database_cleaner'
- gem 'teaspoon'
+ gem 'teaspoon-jasmine'
gem 'meta_request'
# Use Capistrano for deployment
@@ -69,6 +69,7 @@ group :development, :test do
gem 'bullet'
gem 'rack-mini-profiler'
gem 'flamegraph'
+ gem 'stackprof'
end
group :production do
Gemfile.lock
@@ -1,36 +1,36 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.0)
- actionpack (= 4.2.0)
- actionview (= 4.2.0)
- activejob (= 4.2.0)
+ actionmailer (4.2.1)
+ actionpack (= 4.2.1)
+ actionview (= 4.2.1)
+ activejob (= 4.2.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.0)
- actionview (= 4.2.0)
- activesupport (= 4.2.0)
- rack (~> 1.6.0)
+ actionpack (4.2.1)
+ actionview (= 4.2.1)
+ activesupport (= 4.2.1)
+ 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.0)
- activesupport (= 4.2.0)
+ actionview (4.2.1)
+ activesupport (= 4.2.1)
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.0)
- activesupport (= 4.2.0)
+ activejob (4.2.1)
+ activesupport (= 4.2.1)
globalid (>= 0.3.0)
- activemodel (4.2.0)
- activesupport (= 4.2.0)
+ activemodel (4.2.1)
+ activesupport (= 4.2.1)
builder (~> 3.1)
- activerecord (4.2.0)
- activemodel (= 4.2.0)
- activesupport (= 4.2.0)
+ activerecord (4.2.1)
+ activemodel (= 4.2.1)
+ activesupport (= 4.2.1)
arel (~> 6.0)
- activesupport (4.2.0)
+ activesupport (4.2.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -187,16 +187,16 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rack-timeout (0.2.4)
- rails (4.2.0)
- actionmailer (= 4.2.0)
- actionpack (= 4.2.0)
- actionview (= 4.2.0)
- activejob (= 4.2.0)
- activemodel (= 4.2.0)
- activerecord (= 4.2.0)
- activesupport (= 4.2.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)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.0)
+ railties (= 4.2.1)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -216,9 +216,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
- railties (4.2.0)
- actionpack (= 4.2.0)
- activesupport (= 4.2.0)
+ railties (4.2.1)
+ actionpack (= 4.2.1)
+ activesupport (= 4.2.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
@@ -283,8 +283,11 @@ GEM
colorize (>= 0.7.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
+ stackprof (0.2.7)
teaspoon (1.0.2)
railties (>= 3.2.5, < 5)
+ teaspoon-jasmine (2.2.0)
+ teaspoon (>= 1.0.0)
term-ansicolor (1.3.0)
tins (~> 1.0)
terminal-table (1.4.5)
@@ -334,7 +337,7 @@ DEPENDENCIES
capistrano-rails
capistrano-rbenv (~> 2.0)
chartkick
- coffee-rails (~> 4.1.0)
+ coffee-rails (~> 4.1)
coveralls
dalli
database_cleaner
@@ -355,19 +358,20 @@ DEPENDENCIES
puma
rack-mini-profiler
rack-timeout
- rails (= 4.2.0)
+ rails (~> 4.2)
rails-erd
rails_12factor
rspec-rails
sass-rails (~> 5.0)
scale
- sdoc (~> 0.4.0)
+ sdoc (~> 0.4)
sequel
spring
spring-commands-rspec
spring-commands-teaspoon
sqlite3
- teaspoon
+ stackprof
+ teaspoon-jasmine
therubyracer
turbolinks
uglifier (>= 1.3.0)