Commit 189ea484 authored by John Noel Victorino's avatar John Noel Victorino

Updated Gemfile, and Gemfile.lock. Run 'bundle update' if necessary

parent 0dde086d
...@@ -4,19 +4,12 @@ source 'http://rubygems.org' ...@@ -4,19 +4,12 @@ source 'http://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.5.1' gem 'rails', '4.2.5.1'
# Use sqlite3 as the database for Active Record # Use sqlite3 as the database for Active Record
group :development do group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
gem 'sqlite3' gem 'sqlite3'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end end
group :production do group :production do
gem 'pg' gem 'pg'
# gem 'rails_12factor' #use only for Heroku gem 'rails_12factor'
end end
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0' gem 'sass-rails', '~> 5.0'
...@@ -33,12 +26,10 @@ gem 'jquery-rails' ...@@ -33,12 +26,10 @@ gem 'jquery-rails'
gem 'turbolinks' gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0' gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api. # bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc gem 'sdoc', '~> 0.4.0', group: :doc
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7' # gem 'bcrypt', '~> 3.1.7'
# Use Unicorn as the app server # Use Unicorn as the app server
...@@ -54,12 +45,17 @@ group :development, :test do ...@@ -54,12 +45,17 @@ group :development, :test do
gem 'better_errors' gem 'better_errors'
end end
group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end
gem 'simple_form' gem 'simple_form'
gem 'devise' gem 'devise'
# Active if Windows users # Active if Windows users
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] # gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
\ No newline at end of file \ No newline at end of file
...@@ -68,7 +68,7 @@ GEM ...@@ -68,7 +68,7 @@ GEM
globalid (0.3.6) globalid (0.3.6)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
i18n (0.7.0) i18n (0.7.0)
jbuilder (2.5.0) jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1) activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (4.1.1) jquery-rails (4.1.1)
...@@ -93,7 +93,8 @@ GEM ...@@ -93,7 +93,8 @@ GEM
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7) pkg-config (~> 1.1.7)
orm_adapter (0.5.0) orm_adapter (0.5.0)
pg (0.18.0.pre20141117110243-x86-mingw32) pg (0.18.4)
pg (0.18.4-x86-mingw32)
pkg-config (1.1.7) pkg-config (1.1.7)
rack (1.6.4) rack (1.6.4)
rack-test (0.6.3) rack-test (0.6.3)
...@@ -117,6 +118,11 @@ GEM ...@@ -117,6 +118,11 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3) rails-html-sanitizer (1.0.3)
loofah (~> 2.0) loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.5.1) railties (4.2.5.1)
actionpack (= 4.2.5.1) actionpack (= 4.2.5.1)
activesupport (= 4.2.5.1) activesupport (= 4.2.5.1)
...@@ -158,8 +164,6 @@ GEM ...@@ -158,8 +164,6 @@ GEM
turbolinks-source (5.0.0) turbolinks-source (5.0.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
tzinfo-data (1.2016.6)
tzinfo (>= 1.0.0)
uglifier (3.0.0) uglifier (3.0.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
warden (1.2.6) warden (1.2.6)
...@@ -183,13 +187,13 @@ DEPENDENCIES ...@@ -183,13 +187,13 @@ DEPENDENCIES
jquery-rails jquery-rails
pg pg
rails (= 4.2.5.1) rails (= 4.2.5.1)
rails_12factor
sass-rails (~> 5.0) sass-rails (~> 5.0)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
simple_form simple_form
spring spring
sqlite3 sqlite3
turbolinks turbolinks
tzinfo-data
uglifier (>= 1.3.0) uglifier (>= 1.3.0)
web-console (~> 2.0) web-console (~> 2.0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment