diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-08 20:53:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-08 20:53:35 +0300 |
| commit | 57a65ede77b7bbae6e3b2a7aa52135de7b0c2f8e (patch) | |
| tree | 3f1d72a04c3deefb8a911d013e686b036541af60 /app/views/layouts | |
| parent | 8589b4e137f50293952923bb07e2814257d7784d (diff) | |
Improve application settings and write tests
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/devise.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/nav/_admin.html.haml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 8b3872e535d..857ebd9b8d9 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -25,8 +25,8 @@ Perform code reviews and enhance collaboration with merge requests. Each project can also have an issue tracker and a wiki. - - if extra_config.has_key?('sign_in_text') - = markdown(extra_config.sign_in_text) + - if extra_sign_in_text.present? + = markdown(extra_sign_in_text) %hr .container diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml index ea503a9cc2e..fdc517617e3 100644 --- a/app/views/layouts/nav/_admin.html.haml +++ b/app/views/layouts/nav/_admin.html.haml @@ -40,3 +40,8 @@ %span Background Jobs + = nav_link(controller: :application_settings) do + = link_to admin_application_settings_path do + %i.fa.fa-cogs + %span + Settings |