Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/emails_helper.rb2
-rw-r--r--app/helpers/merge_requests_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb
index b336263049c..92cc9c426b8 100644
--- a/app/helpers/emails_helper.rb
+++ b/app/helpers/emails_helper.rb
@@ -31,7 +31,7 @@ module EmailsHelper
end
def add_email_highlight_css
- Rugments::Themes::Github.render(:scope => '.highlight')
+ Rugments::Themes::Github.render(scope: '.highlight')
end
def color_email_diff(diffcontent)
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index fe6fd5832fc..2c9aeba570a 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -15,7 +15,7 @@ module MergeRequestsHelper
end
def new_mr_from_push_event(event, target_project)
- return :merge_request => {
+ return merge_request: {
source_project_id: event.project.id,
target_project_id: target_project.id,
source_branch: event.branch_name,