Skip to content

Commit

Permalink
Update rails to 4.1.7 security patches that can affect our users
Browse files Browse the repository at this point in the history
  • Loading branch information
ook committed Nov 2, 2014
1 parent c647a4b commit 2426b52
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ else
end
end

gem 'rails', '~> 4.1.1'
gem 'rails', '~> 4.1.7'
gem 'htmlentities'
gem 'bluecloth', '~> 2.1'
gem 'coderay', '~> 1.1.0'
Expand Down Expand Up @@ -83,6 +83,7 @@ group :development, :test do
gem 'rspec-rails', '~> 3.1.0'
gem 'simplecov', :require => false
gem 'pry-rails'
gem 'guard-rspec'

This comment has been minimized.

Copy link
@mvz

mvz Nov 3, 2014

Member

Did you add this on purpose or by accident :-)?

This comment has been minimized.

Copy link
@ook

ook Nov 3, 2014

Author Member

Totally by accident, even I'm currently learning how to write efficient rspecs, so my next commits would have add it, but only after a request with you and the others core-commiters ^ ^

end

# Install gems from each theme
Expand Down
8 changes: 8 additions & 0 deletions spec/models/tag_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
expect(tag.display_name).to eq('Monty Python')
end

it 'display names with colon can be found by dash joined name' do
expect(Tag.where(:name => 'SaintSeya:Hades').first).to be_nil
tag = Tag.create(:name => 'SaintSeya:Hades')
expect(tag).to be_valid
expect(tag.name).to eq('saintseya-hades')
expect(tag.display_name).to eq('SaintSeya:Hades')
end

it 'articles can be tagged' do
a = Article.create(:title => 'an article')
foo = FactoryGirl.create(:tag, :name => 'foo')
Expand Down

0 comments on commit 2426b52

Please sign in to comment.