diff options
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r-- | app/controllers/users_controller.rb | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 072d62ddf38..2e3dcb63f46 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,7 +17,7 @@ class UsersController < ApplicationController prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) } before_action :user, except: [:exists] before_action :authorize_read_user_profile!, - only: [:calendar, :calendar_activities, :groups, :projects, :contributed_projects, :snippets] + only: [:calendar, :calendar_activities, :groups, :projects, :contributed_projects, :snippets] def show respond_to do |format| @@ -25,7 +25,7 @@ class UsersController < ApplicationController format.atom do load_events - render layout: 'xml.atom' + render layout: "xml.atom" end format.json do @@ -37,7 +37,7 @@ class UsersController < ApplicationController def activity respond_to do |format| - format.html { render 'show' } + format.html { render "show" } end end @@ -45,10 +45,10 @@ class UsersController < ApplicationController load_groups respond_to do |format| - format.html { render 'show' } + format.html { render "show" } format.json do render json: { - html: view_to_html_string("shared/groups/_list", groups: @groups) + html: view_to_html_string("shared/groups/_list", groups: @groups), } end end @@ -62,7 +62,7 @@ class UsersController < ApplicationController compact_mode = Gitlab::Utils.to_boolean(params[:compact_mode]) respond_to do |format| - format.html { render 'show' } + format.html { render "show" } format.json do pager_json("shared/projects/_list", @projects.count, projects: @projects, skip_pagination: skip_pagination, skip_namespace: skip_namespace, compact_mode: compact_mode) end @@ -73,10 +73,10 @@ class UsersController < ApplicationController load_contributed_projects respond_to do |format| - format.html { render 'show' } + format.html { render "show" } format.json do render json: { - html: view_to_html_string("shared/projects/_list", projects: @contributed_projects) + html: view_to_html_string("shared/projects/_list", projects: @contributed_projects), } end end @@ -86,10 +86,10 @@ class UsersController < ApplicationController load_snippets respond_to do |format| - format.html { render 'show' } + format.html { render "show" } format.json do render json: { - html: view_to_html_string("snippets/_snippets", collection: @snippets) + html: view_to_html_string("snippets/_snippets", collection: @snippets), } end end @@ -100,14 +100,18 @@ class UsersController < ApplicationController end def calendar_activities - @calendar_date = Date.parse(params[:date]) rescue Date.today + @calendar_date = begin + Date.parse(params[:date]) + rescue + Date.today + end @events = contributions_calendar.events_by_date(@calendar_date) - render 'calendar_activities', layout: false + render "calendar_activities", layout: false end def exists - render json: { exists: !!Namespace.find_by_path_or_name(params[:username]) } + render json: {exists: !!Namespace.find_by_path_or_name(params[:username])} end private @@ -133,8 +137,8 @@ class UsersController < ApplicationController def load_projects @projects = PersonalProjectsFinder.new(user).execute(current_user) - .page(params[:page]) - .per(params[:limit]) + .page(params[:page]) + .per(params[:limit]) prepare_projects_for_rendering(@projects) end |