Remove settingslogic

fjordllc · Mar 29, 2013 · 61f70c2 · 61f70c2
1 parent d373f1d
commit 61f70c2
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,3 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
-
-# Ignore setting file
-config/settings.yml
diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,6 @@ gem 'redcarpet'
 gem 'gravatarify'
 gem 'simple_enum'
 gem 'lingman', github: 'hrysd/lingman'
-gem 'settingslogic'
 gem 'ranked-model'
 gem 'font-awesome-sass-rails', '~> 3.0.0.1'
 gem 'bootstrap-sass', '~> 2.3.0.1'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -195,7 +195,6 @@ GEM
       multi_json (~> 1.0)
       rubyzip
       websocket (~> 1.0.4)
-    settingslogic (2.0.9)
     sexp_processor (4.2.0)
     simple_enum (1.6.4)
       activesupport (>= 3.0.0)
@@ -256,7 +255,6 @@ DEPENDENCIES
   redcarpet
   rspec-rails (~> 2.13.0)
   sass-rails (~> 4.0.0.beta1)
-  settingslogic
   simple_enum
   simple_form (~> 3.0.0.beta1)
   sorcery!

diff --git a/app/models/settings.rb b/app/models/settings.rb
diff --git a/config/settings.default.yml b/config/settings.default.yml