diff options
author | Javier Castro <javier.alejandro.castro@gmail.com> | 2014-03-04 15:09:33 -0300 |
---|---|---|
committer | Javier Castro <javier.alejandro.castro@gmail.com> | 2014-03-04 15:09:33 -0300 |
commit | b61f80babb10d0583d3199d557b4e8234d981a33 (patch) | |
tree | 747f124631f6547103bd30d4b48586382b91ae89 /app/controllers/snippets_controller.rb | |
parent | 556ae5ae8187b89a3785219d5621e7ebc9bb7a8c (diff) | |
parent | fbbd989770ea48d472a5c4d7d95b970542279099 (diff) | |
download | gitlab-ce-b61f80babb10d0583d3199d557b4e8234d981a33.tar.gz |
Merge remote-tracking branch 'upstream/master' into fix-4305
Diffstat (limited to 'app/controllers/snippets_controller.rb')
-rw-r--r-- | app/controllers/snippets_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index b91f68aab5e..e54a968326f 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -18,7 +18,7 @@ class SnippetsController < ApplicationController end def user_index - @user = User.find_by_username(params[:username]) + @user = User.find_by(username: params[:username]) @snippets = @user.snippets.fresh.non_expired if @user == current_user |