diff options
author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-04-06 09:37:46 +0200 |
---|---|---|
committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-04-15 14:38:15 +0200 |
commit | 33f8b06c3925fbefd6eac38efc71eac8b787ebd7 (patch) | |
tree | 73556e330e0714897dc6facdcd579c8043561b99 /app/helpers | |
parent | 77a24965cafba42b596039f9058e2e11a7ebc0dd (diff) | |
parent | f76bfed9fc3e52c7b3b731dbb311b6b394d9af62 (diff) | |
download | gitlab-ce-33f8b06c3925fbefd6eac38efc71eac8b787ebd7.tar.gz |
Merge branch 'master' into assign-to-issuable-opener
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/selects_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb index 368762b8265..4fc6de59a8b 100644 --- a/app/helpers/selects_helper.rb +++ b/app/helpers/selects_helper.rb @@ -11,7 +11,7 @@ module SelectsHelper email_user = opts[:email_user] || false first_user = opts[:first_user] && current_user ? current_user.username : false current_user = opts[:current_user] || false - author_id = opts[:author_id] || false + author_id = opts[:author_id] || '' project = opts[:project] || @project html = { |