summaryrefslogtreecommitdiff
path: root/ui_dependencies.rb
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
committerjessib <jessib@riseup.net>2014-01-27 10:30:11 -0800
commit7e0573f3347dca6323eae05127849431ecbceb77 (patch)
tree8a6ff58fdcc93493b5a8f332350b0a9292119906 /ui_dependencies.rb
parent3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff)
parentd578c07e196cd9758fbf1752a9bb8477c260bb30 (diff)
Merge branch 'develop' into feature/messages_api
Conflicts: users/config/locales/en.yml
Diffstat (limited to 'ui_dependencies.rb')
-rw-r--r--ui_dependencies.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui_dependencies.rb b/ui_dependencies.rb
index 2cfd851..4b5d706 100644
--- a/ui_dependencies.rb
+++ b/ui_dependencies.rb
@@ -1,5 +1,5 @@
gem "haml", "~> 3.1.7"
-gem "bootstrap-sass", "~> 2.1.0"
+gem "bootstrap-sass", "= 2.3.2.2"
gem "jquery-rails"
gem "simple_form"
gem 'client_side_validations'
@@ -14,6 +14,8 @@ gem 'rails-i18n' # locale files for built-in validation messages and times
# for a list of keys:
# https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
+gem 'rdiscount' # for rendering .md templates
+
group :assets do
gem "haml-rails", "~> 0.3.4"
gem "sass-rails", "~> 3.2.5"
@@ -24,4 +26,3 @@ group :assets do
gem 'therubyracer', "~> 0.10.2", :platforms => :ruby
end
-