Merge branch 'master' into rails4

expertiza · Aug 29, 2015 · 855c8ac · 855c8ac
2 parents 76ab409 + 5f5aa04
commit 855c8ac
Show file tree

Hide file tree

Showing 7 changed files with 484 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ config/locales/database.yml
 public/assets/staggered_deadline_assignment_graph
 coverage
 app/controllers/auth_controller.rb
-Gemfile.lock
 nohup.out
 pg_data/*
 

diff --git a/Gemfile b/Gemfile
@@ -61,7 +61,7 @@ group :development do
   gem 'pry'
   gem 'pry-remote'
   gem 'pry-nav'
-  gem 'sqlite3-ruby', :require => 'sqlite3'
+  gem 'sqlite3-ruby'
   gem 'selenium-webdriver'
   gem 'quiet_assets'
 end