kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fixes the Cookie path 

Prepares for i18n
This commit is contained in:
Filipa Lacerda 2017-09-05 18:22:20 +01:00
parent fd428a2c1f
commit 5dd1d5782e
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/user_callout.js
View File

@ -22,7 +22,7 @@ export default class UserCallout {
const $currentTarget = $(e.currentTarget);
if (this.options.setCalloutPerProject) {
Cookies.set(this.cookieName, 'true', { expires: 365, path: gon.project_url });
Cookies.set(this.cookieName, 'true', { expires: 365, path: gon.project_path });
} else {
Cookies.set(this.cookieName, 'true', { expires: 365 });
}

12
app/views/shared/_auto_devops_callout.html.haml
View File

@ -6,12 +6,10 @@
.svg-container
= custom_icon('icon_autodevops')
.user-callout-copy
%h4
Auto DevOps (Beta)
%h4= _('Auto DevOps (Beta)')
%p= _('Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
%p
Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.
%p
Learn more in the
= link_to 'Auto DevOps documentation', help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer'
#{s_('Learn more in the')}
= link_to _('Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer'
= link_to 'Enable in settings', project_settings_ci_cd_path(@project), class: 'btn btn-primary js-close-callout'
= link_to _('Enable in settings'), project_settings_ci_cd_path(@project), class: 'btn btn-primary js-close-callout'

2
lib/gitlab/gon_helper.rb
View File

@ -30,7 +30,7 @@ module Gitlab
end
def add_gon_project_variables
gon.project_url = project_url(project)
gon.project_path = project_path(project)
end
end
end