From fbd09871ca7003242053fbca10d9c0e96e7a799d Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Fri, 13 Jan 2017 16:54:16 -0500 Subject: Remove turbolinks. --- app/helpers/javascript_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb index 0e456214d37..cd4075b340d 100644 --- a/app/helpers/javascript_helper.rb +++ b/app/helpers/javascript_helper.rb @@ -1,5 +1,5 @@ module JavascriptHelper def page_specific_javascript_tag(js) - javascript_include_tag asset_path(js), { "data-turbolinks-track" => true } + javascript_include_tag asset_path(js) end end -- cgit v1.2.1 From a0586dbc165cc09422412149712a218938137308 Mon Sep 17 00:00:00 2001 From: Adam Pahlevi Date: Fri, 3 Feb 2017 06:43:19 +0700 Subject: replace `find_with_namespace` with `find_by_full_path` add complete changelog for !8949 --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a112928c6de..bee323993a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -37,7 +37,7 @@ module ApplicationHelper if project_id.is_a?(Project) project_id else - Project.find_with_namespace(project_id) + Project.find_by_full_path(project_id) end if project.avatar_url -- cgit v1.2.1 From 7550f60ddeecebac3f84e8690ab3f42428600ff7 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 1 Feb 2017 14:28:04 +0000 Subject: Backport changes from EE squash Backport changes from the EE-only squash implementation, which would otherwise conflict when merge CE into EE. --- app/helpers/merge_requests_helper.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/helpers') diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 8c2c4e8833b..83ff898e68a 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -143,4 +143,16 @@ module MergeRequestsHelper def different_base?(version1, version2) version1 && version2 && version1.base_commit_sha != version2.base_commit_sha end + + def merge_params(merge_request) + { + merge_when_build_succeeds: true, + should_remove_source_branch: true, + sha: merge_request.diff_head_sha + }.merge(merge_params_ee(merge_request)) + end + + def merge_params_ee(merge_request) + {} + end end -- cgit v1.2.1 From 39fbd18951e7c6bd4b403cd82dd4e008fd00d6fe Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 31 Jan 2017 10:39:44 +0000 Subject: Fixed bug with empty state showing after search Fixed users href path being incorrect --- app/helpers/boards_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/helpers') diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 38c586ccd31..0b1b79ce15b 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -6,7 +6,8 @@ module BoardsHelper endpoint: namespace_project_boards_path(@project.namespace, @project), board_id: board.id, disabled: "#{!can?(current_user, :admin_list, @project)}", - issue_link_base: namespace_project_issues_path(@project.namespace, @project) + issue_link_base: namespace_project_issues_path(@project.namespace, @project), + root_path: root_path, } end end -- cgit v1.2.1 From 103c78f18c0642c36a6093508707b82eb8d1dd77 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 31 Jan 2017 14:35:53 +0000 Subject: Removes labels instead of closing issue when clicking remove button --- app/helpers/boards_helper.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/helpers') diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 0b1b79ce15b..f43827da446 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -8,6 +8,7 @@ module BoardsHelper disabled: "#{!can?(current_user, :admin_list, @project)}", issue_link_base: namespace_project_issues_path(@project.namespace, @project), root_path: root_path, + bulk_update_path: bulk_update_namespace_project_issues_path(@project.namespace, @project), } end end -- cgit v1.2.1