Merge branch 'develop' of github.com:amooma/GS5 into develop

2 files changed, 5 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 375743f..bec37ee 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'jquery-rails'
 group :development do
   gem 'factory_girl_rails'
   gem 'factory_girl'
+  gem 'sextant' # Rails 4 stuff
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 0beeb3b..3ee9d06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -147,6 +147,9 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
+    sextant (0.2.3)
+      activesupport (>= 3.2)
+      rails (>= 3.2)
     simple_form (2.0.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -210,6 +213,7 @@ DEPENDENCIES
   private_pub
   rails (= 3.2.11)
   sass-rails
+  sextant
   simple_form (= 2.0.1)
   sqlite3
   state_machine