diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects/tags_controller.rb | 7 | ||||
| -rw-r--r-- | app/views/dashboard/projects/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/group_members/_group_member.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/tags/destroy.js.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 2 |
8 files changed, 17 insertions, 6 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 2df6924b13d..aeafbd30143 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = @projects.sort(@sort = params[:sort]) @projects = @projects.includes(:namespace) - terms = params['filter_projects'] + terms = params[:filter_projects] if terms.present? @projects = @projects.search(terms) @@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = @projects.includes(:namespace, :forked_from_project, :tags) @projects = @projects.sort(@sort = params[:sort]) - terms = params['filter_projects'] + terms = params[:filter_projects] if terms.present? @projects = @projects.search(terms) diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb index 280fe12cc7c..e580487a2c6 100644 --- a/app/controllers/projects/tags_controller.rb +++ b/app/controllers/projects/tags_controller.rb @@ -34,6 +34,11 @@ class Projects::TagsController < Projects::ApplicationController def destroy DeleteTagService.new(project, current_user).execute(params[:id]) - redirect_to namespace_project_tags_path(@project.namespace, @project) + respond_to do |format| + format.html do + redirect_to namespace_project_tags_path(@project.namespace, @project) + end + format.js + end end end diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml index 53abf274bdb..4565e752c1f 100644 --- a/app/views/dashboard/projects/index.html.haml +++ b/app/views/dashboard/projects/index.html.haml @@ -10,7 +10,7 @@ - if @last_push = render "events/event_last_push", event: @last_push -- if @projects.any? +- if @projects.any? || params[:filter_projects] = render 'projects' - else = render "zero_authorized_projects" diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml index a79a0fcdc8e..60234be8f83 100644 --- a/app/views/groups/group_members/_group_member.html.haml +++ b/app/views/groups/group_members/_group_member.html.haml @@ -1,5 +1,6 @@ - user = member.user - return unless user || member.invite? +- show_roles = local_assigns.fetch(:show_roles, true) %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)} %span{class: ("list-item-name" if show_controls)} @@ -28,7 +29,7 @@ = link_to resend_invite_group_group_member_path(@group, member), method: :post, class: "btn-xs btn", title: 'Resend invite' do Resend invite - - if should_user_see_group_roles?(current_user, @group) + - if show_roles && should_user_see_group_roles?(current_user, @group) %span.pull-right %strong.member-access-level= member.human_access - if show_controls diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 1173e0a78c7..7d8798981e3 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -29,6 +29,7 @@ %span.creator · by #{link_to_member(@project, @issue.author, size: 24)} + = '@' + @issue.author.username · = time_ago_with_tooltip(@issue.created_at, placement: 'bottom', html_class: 'issue_created_ago') diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index b634a4af8d2..339031f15b2 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -6,6 +6,7 @@ %span.creator · by #{link_to_member(@project, @merge_request.author, size: 24)} + = '@' + @merge_request.author.username · = time_ago_with_tooltip(@merge_request.created_at) diff --git a/app/views/projects/tags/destroy.js.haml b/app/views/projects/tags/destroy.js.haml new file mode 100644 index 00000000000..ffeacb5a004 --- /dev/null +++ b/app/views/projects/tags/destroy.js.haml @@ -0,0 +1,3 @@ +$('.js-totaltags-count').html("#{@repository.tags.size}"); +- if @repository.tags.empty? + $('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000) diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index e75af50a537..2446e6c30ae 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -23,7 +23,7 @@ Show all = paginate projects, theme: "gitlab" if projects.respond_to? :total_pages - else - %h3 No projects found + .nothing-here-block No projects found :javascript new ProjectsList(); |