Merge branch 'dev'
Showing
... | @@ -21,6 +21,8 @@ gem "git" | ... | @@ -21,6 +21,8 @@ gem "git" |
gem "acts_as_list" | gem "acts_as_list" | ||
gem 'rdiscount' | gem 'rdiscount' | ||
gem 'acts-as-taggable-on', '~>2.1.0' | |||
group :assets do | group :assets do | ||
gem 'sass-rails', " ~> 3.1.0" | gem 'sass-rails', " ~> 3.1.0" | ||
gem 'coffee-rails', "~> 3.1.0" | gem 'coffee-rails', "~> 3.1.0" | ||
... | ... |
| W: | H:
| W: | H:
396 Bytes
This diff is collapsed.
This diff is collapsed.
spec/requests/tags_spec.rb
0 → 100644