summaryrefslogtreecommitdiff
path: root/app/controllers/snippets_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-02 07:34:58 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-02 07:34:58 +0000
commitcfbff017d0ba1ba4fd896b4762b23853f123c60a (patch)
tree1f381ccc24888ccbd82a8b220ad1254fc5be7afb /app/controllers/snippets_controller.rb
parent812c7a85df81c526b6f21de8c057eb3ba0c20874 (diff)
parenta2eee3181c6b0fc3ef8b95f3187704a2b12774e4 (diff)
downloadgitlab-ce-cfbff017d0ba1ba4fd896b4762b23853f123c60a.tar.gz
Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' into 'master'
Add a page title to every page. ![You get a title, and you get a title; everyone gets a title!](https://i.imgflip.com/kvmq8.jpg) The `page_title` helper pushes the provided string at the end of the title, but because of the order that layouts are rendered in by ActionView, the result is always this: ``` <title from view> | <title from as specified in the controller or by its layout> | <title from layouts/_head> ``` For example: `Merge Requests | GitLab.org / Gitlab Community Edition | GitLab`. All a developer needs to know is to put a `page_title` call describing the page in question at the start of every template. To get everything where I wanted it to go without too much duplication, I had to make some changes around layouts, sidebars and controllers. See merge request !593
Diffstat (limited to 'app/controllers/snippets_controller.rb')
-rw-r--r--app/controllers/snippets_controller.rb14
1 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index a5259466cb8..cf672c5c093 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -7,14 +7,11 @@ class SnippetsController < ApplicationController
# Allow destroy snippet
before_action :authorize_admin_snippet!, only: [:destroy]
- before_action :set_title
-
skip_before_action :authenticate_user!, only: [:index, :user_index, :show, :raw]
+ layout 'snippets'
respond_to :html
- layout :determine_layout
-
def index
if params[:username].present?
@user = User.find_by(username: params[:username])
@@ -98,16 +95,7 @@ class SnippetsController < ApplicationController
return render_404 unless can?(current_user, :admin_personal_snippet, @snippet)
end
- def set_title
- @title = 'Snippets'
- @title_url = snippets_path
- end
-
def snippet_params
params.require(:personal_snippet).permit(:title, :content, :file_name, :private, :visibility_level)
end
-
- def determine_layout
- current_user ? 'snippets' : 'public_users'
- end
end