Gemfile in tawork-0.0.46 vs Gemfile in tawork-0.0.47

- old
+ new

@@ -1,11 +1,11 @@ source 'https://rubygems.org' source 'https://rails-assets.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # gem 'rails', '4.1.0.beta1' -gem 'rails', "4.1.0.rc1" +gem 'rails', "4.2.1" # Use mysql as the database for Active Record gem 'mysql2' gem 'bootstrap-sass' @@ -19,10 +19,12 @@ gem 'haml-contrib' gem 'ancestry' gem 'devise' gem 'omniauth-openid' +gem "omniauth-google-oauth2" +gem "figaro" gem 'simple_form' gem 'aasm' gem 'acts_as_list', git: "git@github.com:swanandp/acts_as_list.git" gem 'acts-as-taggable-on' gem 'public_activity' @@ -64,11 +66,11 @@ # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +# gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.2' group :doc do @@ -77,9 +79,10 @@ end gem 'pry-rails' group :development do + gem 'web-console', '~> 2.0' gem "better_errors" gem "binding_of_caller" # gem 'rack-mini-profiler' gem 'foreman' gem "thin"