summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-06-19 00:34:11 -0700
committerelijah <elijah@riseup.net>2013-07-04 04:02:06 -0700
commit1157caf42ebd9ccfd25c455115abfa79bcf90e03 (patch)
treea355c505010af1fc82eaa58295e6af478af3e005
parent8393058ac15d72be702a6de481d6129aed4bbef3 (diff)
remove gem bootstrap-editable
-rw-r--r--app/assets/javascripts/application.js4
-rw-r--r--ui_dependencies.rb10
2 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 049a392..ad4dbbf 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,8 +14,8 @@
//= require jquery_ujs
//= require srp
//= require bootstrap
-//= require bootstrap-editable
-//= require bootstrap-editable-rails
+//# require bootstrap-editable
+//# require bootstrap-editable-rails
//= require rails.validations
//= require rails.validations.simple_form
diff --git a/ui_dependencies.rb b/ui_dependencies.rb
index b24eef1..2cfd851 100644
--- a/ui_dependencies.rb
+++ b/ui_dependencies.rb
@@ -4,10 +4,16 @@ gem "jquery-rails"
gem "simple_form"
gem 'client_side_validations'
gem 'client_side_validations-simple_form'
-gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be issues with 0.14.0 when using couchrest
-gem 'bootstrap-editable-rails', "~>0.0.4"
gem "bootswatch-rails", "~> 0.5.0"
+gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be
+ # issues with 0.14.0 when using couchrest
+
+gem 'rails-i18n' # locale files for built-in validation messages and times
+ # https://github.com/svenfuchs/rails-i18n
+ # for a list of keys:
+ # https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
+
group :assets do
gem "haml-rails", "~> 0.3.4"
gem "sass-rails", "~> 3.2.5"