From 3a6c7a2df3629010fe22705dc15c922fcc1ea5f4 Mon Sep 17 00:00:00 2001 From: Mark Fletcher Date: Wed, 15 Mar 2017 09:35:22 +0530 Subject: Display full project name with namespace upon deletion * Removes ambiguity when two projects exist with the same name --- app/controllers/projects_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/projects_controller.rb') diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3e2015b7d5e..e4fd53eed29 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -117,7 +117,7 @@ class ProjectsController < Projects::ApplicationController return access_denied! unless can?(current_user, :remove_project, @project) ::Projects::DestroyService.new(@project, current_user, {}).async_execute - flash[:alert] = "Project '#{@project.name}' will be deleted." + flash[:alert] = "Project '#{@project.name_with_namespace}' will be deleted." redirect_to dashboard_projects_path rescue Projects::DestroyService::DestroyError => ex -- cgit v1.2.1 From 668a5b9fe1712ba082e4b0ba6d6bf54bc5691a49 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 15 Mar 2017 14:38:47 +0800 Subject: Fix projects without repo and wiki When repo and wiki are disabled for a project, we're showing issues so we'll need to set @issuable_meta_data otherwise it would be giving nil errors. See: https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/ --- app/controllers/projects_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/controllers/projects_controller.rb') diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 3e2015b7d5e..16e702073b2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -267,8 +267,9 @@ class ProjectsController < Projects::ApplicationController @project_wiki = @project.wiki @wiki_home = @project_wiki.find_page('home', params[:version_id]) elsif @project.feature_available?(:issues, current_user) - @issues = issues_collection - @issues = @issues.page(params[:page]) + @issues = issues_collection.page(params[:page]) + @collection_type = 'Issue' + @issuable_meta_data = issuable_meta_data(@issues, @collection_type) end render :show -- cgit v1.2.1 From 68e3fa0e58938152357c6fb5997f1229666b1d5c Mon Sep 17 00:00:00 2001 From: Alex Sanford Date: Fri, 17 Mar 2017 12:35:39 +0000 Subject: Add ability to disable Merge Request URL on push --- app/controllers/projects_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers/projects_controller.rb') diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 395a8bffe92..47f7e0b1b28 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -316,6 +316,7 @@ class ProjectsController < Projects::ApplicationController :namespace_id, :only_allow_merge_if_all_discussions_are_resolved, :only_allow_merge_if_pipeline_succeeds, + :printing_merge_request_link_enabled, :path, :public_builds, :request_access_enabled, -- cgit v1.2.1