diff --git a/Gemfile b/Gemfile index b1931b2..35e99ad 100755 --- a/Gemfile +++ b/Gemfile @@ -60,16 +60,17 @@ gem "paper_trail" , '~>3.0.5'#, :git=>'git://github.com/airblade/paper_trail.git # User management gem "devise" ,'~>2.2.3' -gem "omniauth" -gem "omniauth-facebook" -gem "omniauth-ldap" +gem "omniauth", '~>1.2.2' +gem "omniauth-facebook", '~>2.0.0' +gem "omniauth-ldap", '~>1.0.4' -gem "fb_graph" +gem "fb_graph",'~>2.7.17' gem "meta-tags" # Roles for users -gem "rolify" +gem "rolify", '~>4.0.0' # Abilities -gem "cancan" +gem "cancan", '~>1.6.0' + # Fileupload @@ -87,12 +88,13 @@ group :development, :test do gem 'factory_girl_rails',"~>4.5.0" #gem 'minitest', "~>4.7.5" gem 'progress_bar' -gem 'rspec-rails', '~>3.2.0' - +gem 'rspec-core', '~>3.3.0' +gem 'rspec-rails', '~>3.3.0' gem 'rspec-collection_matchers' gem 'rspec-activemodel-mocks' gem 'rspec-html-matchers' gem 'rspec-expectations' +gem 'capybara', '~>2.5.0' end gem "simple_calendar", "~> 0.1.9"