diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-17 20:16:04 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-17 20:16:04 +0300 |
| commit | 6f0856535e242694805909b824e9e238372e3f65 (patch) | |
| tree | 5a770cbbd78df17969110e1539f0a21b320710fa | |
| parent | cfa3602a1303c39e78d5bf23ad0ab34b1966d397 (diff) | |
Remove redundant helper method.
| -rw-r--r-- | app/helpers/preferences_helper.rb | 10 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 7 |
2 files changed, 5 insertions, 12 deletions
diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb index 5a49ab8195c..c73cb3028ee 100644 --- a/app/helpers/preferences_helper.rb +++ b/app/helpers/preferences_helper.rb @@ -47,13 +47,7 @@ module PreferencesHelper Gitlab::ColorSchemes.for_user(current_user).css_class end - def prefer_readme? - !current_user || - current_user.project_view == 'readme' - end - - def current_user_default_project_view - (current_user && current_user.project_view) || - 'readme' + def default_project_view + current_user ? current_user.project_view : 'readme' end end diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index f8c06d8b06b..585caf674c9 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -27,7 +27,7 @@ = link_to project_files_path(@project) do = repository_size - - if !prefer_readme? && @repository.readme + - if default_project_view != 'readme' && @repository.readme %li = link_to 'Readme', readme_path(@project) @@ -67,9 +67,8 @@ .content-block.second-block.white = render 'projects/last_commit', commit: @repository.commit, project: @project -%section - %div{class: "project-show-#{current_user_default_project_view}"} - = render current_user_default_project_view +%div{class: "project-show-#{default_project_view}"} + = render default_project_view - if current_user - access = user_max_access_in_project(current_user, @project) |