diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-16 21:09:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-16 21:09:25 +0300 |
| commit | e18006fc6313b1d04128416cdb5f1533adcdb53e (patch) | |
| tree | ad418c4afbfcc8f83bcf5b4a9c897a2139e79e13 /app/helpers | |
| parent | cb8835f38a3e4c188e9a73adf45936e2a95f40ae (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/auth_helper.rb | 3 | ||||
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/work_items_helper.rb | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index d0a9197db0a..61fe9e133ea 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -52,8 +52,7 @@ module AuthHelper saml: 'saml-login-button', openid_connect: 'oidc-login-button', github: 'github-login-button', - gitlab: 'gitlab-oauth-login-button', - facebook: 'facebook-login-button' + gitlab: 'gitlab-oauth-login-button' }[provider.to_sym] end diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 96ae7be5fdc..7db833edff5 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -184,7 +184,7 @@ module GroupsHelper } end - def enabled_git_access_protocol_options_for_group(_) + def enabled_git_access_protocol_options_for_group case ::Gitlab::CurrentSettings.enabled_git_access_protocol when nil, "" [[_("Both SSH and HTTP(S)"), "all"], [_("Only SSH"), "ssh"], [_("Only HTTP(S)"), "http"]] diff --git a/app/helpers/work_items_helper.rb b/app/helpers/work_items_helper.rb index d2e3d41377a..b7e9699dc12 100644 --- a/app/helpers/work_items_helper.rb +++ b/app/helpers/work_items_helper.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module WorkItemsHelper - def work_items_index_data(resource_parent) + def work_items_show_data(resource_parent) { full_path: resource_parent.full_path, issues_list_path: |