Skip to content

G
gitlab-ce
Commit 8218713e authored by Tim Zallmann's avatar Tim Zallmann
Browse files
Options

Merge branch 'ee-40468-empty-states' into 'master' 

Update empty state for service desk

See merge request gitlab-org/gitlab-ee!3710
parents 90697efb 1e85d70d
Hide whitespace changes
Inline Side-by-side
Showing with 294 additions and 165 deletions
ee/app/assets/stylesheets/pages/service_desk.scss
View file @ 8218713e
.service-desk-issues {
.empty-state {
max-width: 450px;
text-align: center;
}
.non-empty-state {
text-align: left;
padding-bottom: $gl-padding-top;
border-bottom: 1px solid $border-color;
.service-desk-graphic {
margin-top: $gl-padding;
}
.media-body {
margin-top: $gl-padding-top;
margin-left: $gl-padding;
}
}
.turn-on-btn-container {
margin-top: $gl-padding-top;
}
}
ee/app/views/projects/issues/_service_desk_info_content.html.haml
View file @ 8218713e
......@@ -4,22 +4,26 @@
- callout_selector = is_empty_state ? 'empty-state' : 'non-empty-state media'
- svg_path = !is_empty_state ? 'shared/empty_states/icons/service_desk_callout.svg' : 'shared/empty_states/icons/service_desk_empty_state.svg'
- can_edit_project_settings = can?(current_user, :admin_project, @project)
- title_text = _("Use Service Desk to connect with your users (e.g. to offer customer support) through email right inside GitLab")
%div{ class: "#{callout_selector}" }
.service-desk-graphic
.svg-content
= render svg_path
.media-body
%h5 Use Service Desk to connect with your users (e.g. to offer customer support) through email right inside GitLab.
%div{ class: is_empty_state ? "text-content" : "prepend-top-10 prepend-left-default" }
- if is_empty_state
%h4= title_text
- else
%h5= title_text
- if service_desk_enabled
%p
Have your users email
= _("Have your users email")
%code= @project.service_desk_address
%span Those emails automatically become issues (with the comments becoming the email conversation) listed here.
= link_to 'Read more', help_page_path('user/project/service_desk')
%span= _("Those emails automatically become issues (with the comments becoming the email conversation) listed here.")
= link_to _('Read more'), help_page_path('user/project/service_desk')
- if can_edit_project_settings && !service_desk_enabled
.turn-on-btn-container
= link_to "Turn on Service Desk", edit_project_path(@project), class: 'btn btn-new btn-inverted'
%div{ class: is_empty_state ? "text-center" : "prepend-top-10" }
= link_to _("Turn on Service Desk"), edit_project_path(@project), class: 'btn btn-success'
locale/gitlab.pot
View file @ 8218713e
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-12-05 20:31+0100\n"
"PO-Revision-Date: 2017-12-05 20:31+0100\n"
"POT-Creation-Date: 2017-12-12 18:31+0000\n"
"PO-Revision-Date: 2017-12-12 18:31+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -105,12 +105,18 @@ msgstr ""
msgid "Activity"
msgstr ""
msgid "Add"
msgstr ""
msgid "Add Changelog"
msgstr ""
msgid "Add Contribution guide"
msgstr ""
msgid "Add Group Webhooks and GitLab Enterprise Edition."
msgstr ""
msgid "Add License"
msgstr ""
......@@ -129,6 +135,9 @@ msgstr ""
msgid "An error occurred when toggling the notification subscription"
msgstr ""
msgid "An error occurred when updating the issue weight"
msgstr ""
msgid "An error occurred while fetching sidebar data"
msgstr ""
......@@ -216,6 +225,60 @@ msgstr ""
msgid "Available"
msgstr ""
msgid "Billing"
msgstr ""
msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan."
msgstr ""
msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available."
msgstr ""
msgid "BillingPlans|Current plan"
msgstr ""
msgid "BillingPlans|Customer Support"
msgstr ""
msgid "BillingPlans|Downgrade"
msgstr ""
msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}."
msgstr ""
msgid "BillingPlans|Manage plan"
msgstr ""
msgid "BillingPlans|Please contact %{customer_support_link} in that case."
msgstr ""
msgid "BillingPlans|See all %{plan_name} features"
msgstr ""
msgid "BillingPlans|This group uses the plan associated with its parent group."
msgstr ""
msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}."
msgstr ""
msgid "BillingPlans|Upgrade"
msgstr ""
msgid "BillingPlans|You are currently on the %{plan_link} plan."
msgstr ""
msgid "BillingPlans|frequently asked questions"
msgstr ""
msgid "BillingPlans|monthly"
msgstr ""
msgid "BillingPlans|paid annually at %{price_per_year}"
msgstr ""
msgid "BillingPlans|per user"
msgstr ""
msgid "Branch"
msgid_plural "Branches"
msgstr[0] ""
......@@ -293,6 +356,9 @@ msgstr ""
msgid "Branches|Sort by"
msgstr ""
msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart."
msgstr ""
msgid "Branches|The default branch cannot be deleted"
msgstr ""
......@@ -305,9 +371,15 @@ msgstr ""
msgid "Branches|To confirm, type %{branch_name_confirmation}:"
msgstr ""
msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above."
msgstr ""
msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}."
msgstr ""
msgid "Branches|diverged from upstream"
msgstr ""
msgid "Branches|merged"
msgstr ""
......@@ -347,6 +419,9 @@ msgstr ""
msgid "Cancel edit"
msgstr ""
msgid "Change Weight"
msgstr ""
msgid "ChangeTypeActionLabel|Pick into branch"
msgstr ""
......@@ -377,13 +452,10 @@ msgstr ""
msgid "Cherry-pick this commit"
msgstr ""
msgid "Checking branch availability..."
msgstr ""
msgid "Cherry-pick this commit"
msgid "Cherry-pick this merge request"
msgstr ""
msgid "Cherry-pick this merge request"
msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all."
msgstr ""
msgid "CiStatusLabel|canceled"
......@@ -446,10 +518,10 @@ msgstr ""
msgid "Clone repository"
msgstr ""
msgid "Cluster"
msgid "Close"
msgstr ""
msgid "ClusterIntegration|%{appList} was successfully installed on your cluster"
msgid "Cluster"
msgstr ""
msgid "ClusterIntegration|%{appList} was successfully installed on your cluster"
......@@ -823,13 +895,13 @@ msgstr ""
msgid "ContributorsPage|Please wait a moment, this page will automatically refresh when ready."
msgstr ""
msgid "ContributorsPage|Building repository graph."
msgid "Control the maximum concurrency of LFS/attachment backfill for this secondary node"
msgstr ""
msgid "ContributorsPage|Commits to %{branch_name}, excluding merge commits. Limited to 6,000 commits."
msgid "Control the maximum concurrency of repository backfill for this secondary node"
msgstr ""
msgid "ContributorsPage|Please wait a moment, this page will automatically refresh when ready."
msgid "Copy SSH public key to clipboard"
msgstr ""
msgid "Copy URL to clipboard"
......@@ -850,6 +922,9 @@ msgstr ""
msgid "Create empty bare repository"
msgstr ""
msgid "Create epic"
msgstr ""
msgid "Create file"
msgstr ""
......@@ -877,6 +952,9 @@ msgstr ""
msgid "CreateTokenToCloneLink|create a personal access token"
msgstr ""
msgid "Creating epic"
msgstr ""
msgid "Cron Timezone"
msgstr ""
......@@ -945,6 +1023,9 @@ msgstr ""
msgid "Description"
msgstr ""
msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project."
msgstr ""
msgid "Details"
msgstr ""
......@@ -957,6 +1038,9 @@ msgstr ""
msgid "Dismiss Cycle Analytics introduction box"
msgstr ""
msgid "Dismiss Merge Request promotion"
msgstr ""
msgid "Don't show again"
msgstr ""
......@@ -1047,6 +1131,18 @@ msgstr ""
msgid "Environments|You don't have any environments right now."
msgstr ""
msgid "Epic will be removed! Are you sure?"
msgstr ""
msgid "Epics"
msgstr ""
msgid "Epics let you manage your portfolio of projects more efficiently and with less effort"
msgstr ""
msgid "Error creating epic"
msgstr ""
msgid "Error occurred when toggling the notification subscription"
msgstr ""
......@@ -1139,6 +1235,36 @@ msgstr ""
msgid "GPG Keys"
msgstr ""
msgid "Geo Nodes"
msgstr ""
msgid "GeoNodeSyncStatus|Failed"
msgstr ""
msgid "GeoNodeSyncStatus|Node is failing or broken."
msgstr ""
msgid "GeoNodeSyncStatus|Node is slow, overloaded, or it just recovered after an outage."
msgstr ""
msgid "GeoNodeSyncStatus|Out of sync"
msgstr ""
msgid "GeoNodeSyncStatus|Synced"
msgstr ""
msgid "Geo|File sync capacity"
msgstr ""
msgid "Geo|Groups to replicate"
msgstr ""
msgid "Geo|Repository sync capacity"
msgstr ""
msgid "Geo|Select groups to replicate."
msgstr ""
msgid "Git storage health information has been reset"
msgstr ""
......@@ -1190,9 +1316,6 @@ msgstr ""
msgid "GroupsEmptyState|You can manage your group member’s permissions and access to each project in the group."
msgstr ""
msgid "GroupsTreeRole|as"
msgstr ""
msgid "GroupsTree|Are you sure you want to leave the \"${this.group.fullName}\" group?"
msgstr ""
......@@ -1223,6 +1346,9 @@ msgstr ""
msgid "GroupsTree|Sorry, no groups or projects matched your search"
msgstr ""
msgid "Have your users email"
msgstr ""
msgid "Health Check"
msgstr ""
......@@ -1250,46 +1376,48 @@ msgstr ""
msgid "Import repository"
msgstr ""
msgid "Install a Runner compatible with GitLab CI"
msgid "Improve Issue boards with GitLab Enterprise Edition."
msgstr ""
msgid "Internal - The group and any internal projects can be viewed by any logged in user."
msgid "Improve issues management with Issue weight and GitLab Enterprise Edition."
msgstr ""
msgid "Internal - The project can be accessed by any logged in user."
msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
msgstr ""
msgid "Interval Pattern"
msgid "Install a Runner compatible with GitLab CI"
msgstr ""
msgid "Introducing Cycle Analytics"
msgstr ""
msgid "Instance"
msgid_plural "Instances"
msgstr[0] ""
msgstr[1] ""
msgid "Issue events"
msgid "Internal - The group and any internal projects can be viewed by any logged in user."
msgstr ""
msgid "IssueBoards|Board"
msgid "Internal - The project can be accessed by any logged in user."
msgstr ""
msgid "Issues"
msgid "Interval Pattern"
msgstr ""
msgid "Jan"
msgid "Introducing Cycle Analytics"
msgstr ""
msgid "January"
msgid "Issue board focus mode"
msgstr ""
msgid "Jul"
msgid "Issue events"
msgstr ""
msgid "July"
msgid "IssueBoards|Board"
msgstr ""
msgid "Jun"
msgid "IssueBoards|Boards"
msgstr ""
msgid "June"
msgid "Issues"
msgstr ""
msgid "Jan"
......@@ -1363,6 +1491,9 @@ msgstr ""
msgid "Leave project"
msgstr ""
msgid "License"
msgstr ""
msgid "Limited to showing %d event at most"
msgid_plural "Limited to showing %d events at most"
msgstr[0] ""
......@@ -1374,13 +1505,10 @@ msgstr ""
msgid "Locked"
msgstr ""
msgid "Login"
msgstr ""
msgid "Mar"
msgid "Locked Files"
msgstr ""
msgid "March"
msgid "Login"
msgstr ""
msgid "Mar"
......@@ -1422,6 +1550,9 @@ msgstr ""
msgid "More information is available|here"
msgstr ""
msgid "Multiple issue boards"
msgstr ""
msgid "New Cluster"
msgstr ""
......@@ -1442,6 +1573,9 @@ msgstr ""
msgid "New directory"
msgstr ""
msgid "New epic"
msgstr ""
msgid "New file"
msgstr ""
......@@ -1571,6 +1705,9 @@ msgstr ""
msgid "Only project members can comment."
msgstr ""
msgid "Opened"
msgstr ""
msgid "OpenedNDaysAgo|Opened"
msgstr ""
......@@ -1616,6 +1753,9 @@ msgstr ""
msgid "Pipeline Schedules"
msgstr ""
msgid "Pipeline quota"
msgstr ""
msgid "PipelineCharts|Failed:"
msgstr ""
......@@ -1700,6 +1840,9 @@ msgstr ""
msgid "Pipeline|with stages"
msgstr ""
msgid "Please solve the reCAPTCHA"
msgstr ""
msgid "Preferences"
msgstr ""
......@@ -1802,16 +1945,28 @@ msgstr ""
msgid "ProjectNetworkGraph|Graph"
msgstr ""
msgid "ProjectSettings|Contact an admin to change this setting."
msgstr ""
msgid "ProjectSettings|Immediately run a pipeline on the default branch"
msgstr ""
msgid "ProjectSettings|Only signed commits can be pushed to this repository."
msgstr ""
msgid "ProjectSettings|Problem setting up the CI/CD settings JavaScript"
msgstr ""
msgid "ProjectSettings|Immediately run a pipeline on the default branch"
msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin."
msgstr ""
msgid "ProjectSettings|Problem setting up the CI/CD settings JavaScript"
msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project."
msgstr ""
msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin."
msgstr ""
msgid "ProjectSettings|Users can only push commits to this repository that were committed with one of their own verified emails."
msgstr ""
msgid "Projects"
......@@ -1874,43 +2029,16 @@ msgstr ""
msgid "Public - The group and any public projects can be viewed without any authentication."
msgstr ""
msgid "PrometheusService|Finding and configuring metrics..."
msgstr ""
msgid "PrometheusService|Metrics"
msgstr ""
msgid "PrometheusService|Metrics are automatically configured and monitored based on a library of metrics from popular exporters."
msgstr ""
msgid "PrometheusService|Missing environment variable"
msgstr ""
msgid "PrometheusService|Monitored"
msgstr ""
msgid "PrometheusService|More information"
msgstr ""
msgid "PrometheusService|No metrics are being monitored. To start monitoring, deploy to an environment."
msgstr ""
msgid "PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/"
msgstr ""
msgid "PrometheusService|Prometheus monitoring"
msgstr ""
msgid "PrometheusService|View environments"
msgid "Public - The project can be accessed without any authentication."
msgstr ""
msgid "Public - The group and any public projects can be viewed without any authentication."
msgid "Push Rules"
msgstr ""
msgid "Public - The project can be accessed without any authentication."
msgid "Push events"
msgstr ""
msgid "Push events"
msgid "PushRule|Committer restriction"
msgstr ""
msgid "Read more"
......@@ -1925,6 +2053,9 @@ msgstr ""
msgid "RefSwitcher|Tags"
msgstr ""
msgid "Registry"
msgstr ""
msgid "Related Commits"
msgstr ""
......@@ -1991,6 +2122,9 @@ msgstr ""
msgid "Scheduling Pipelines"
msgstr ""
msgid "Scoped issue boards"
msgstr ""
msgid "Search branches and tags"
msgstr ""
......@@ -2050,6 +2184,21 @@ msgid_plural "Showing %d events"
msgstr[0] ""
msgstr[1] ""
msgid "Sidebar|Change weight"
msgstr ""
msgid "Sidebar|Edit"
msgstr ""
msgid "Sidebar|No"
msgstr ""
msgid "Sidebar|None"
msgstr ""
msgid "Sidebar|Weight"
msgstr ""
msgid "Snippets"
msgstr ""
......@@ -2107,6 +2256,9 @@ msgstr ""
msgid "SortOptions|Least popular"
msgstr ""
msgid "SortOptions|Less weight"
msgstr ""
msgid "SortOptions|Milestone"
msgstr ""
......@@ -2116,6 +2268,9 @@ msgstr ""
msgid "SortOptions|Milestone due soon"
msgstr ""
msgid "SortOptions|More weight"
msgstr ""
msgid "SortOptions|Most popular"
msgstr ""
......@@ -2155,6 +2310,9 @@ msgstr ""
msgid "SortOptions|Start soon"
msgstr ""
msgid "SortOptions|Weight"
msgstr ""
msgid "Source"
msgstr ""
......@@ -2277,76 +2435,13 @@ msgstr ""
msgid "Target Branch"
msgstr ""
msgid "TagsPage|Browse files"
msgstr ""
msgid "TagsPage|Can't find HEAD commit for this tag"
msgstr ""
msgid "TagsPage|Cancel"
msgstr ""
msgid "TagsPage|Create tag"
msgstr ""
msgid "TagsPage|Delete tag"
msgstr ""
msgid "TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?"
msgstr ""
msgid "TagsPage|Edit release notes"
msgstr ""
msgid "TagsPage|Existing branch name, tag, or commit SHA"
msgstr ""
msgid "TagsPage|Filter by tag name"
msgstr ""
msgid "TagsPage|New Tag"
msgstr ""
msgid "TagsPage|New tag"
msgstr ""
msgid "TagsPage|Optionally, add a message to the tag."
msgstr ""
msgid "TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page."
msgstr ""
msgid "TagsPage|Release notes"
msgstr ""
msgid "TagsPage|Repository has no tags yet."
msgstr ""
msgid "TagsPage|Sort by"
msgstr ""
msgid "TagsPage|Tags"
msgstr ""
msgid "TagsPage|Tags give the ability to mark specific points in history as being important"
msgstr ""
msgid "TagsPage|This tag has no release notes."
msgstr ""
msgid "TagsPage|Use git tag command to add a new one:"
msgstr ""
msgid "TagsPage|Write your release notes or drag files here..."
msgstr ""
msgid "TagsPage|protected"
msgid "Team"
msgstr ""
msgid "Target Branch"
msgid "Thanks! Don't show me this again"
msgstr ""
msgid "Team"
msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
msgstr ""
msgid "The circuitbreaker backoff threshold should be lower than the failure count threshold"
......@@ -2418,6 +2513,9 @@ msgstr ""
msgid "There are problems accessing Git storage: "
msgstr ""
msgid "This board\\'s scope is reduced"
msgstr ""
msgid "This branch has changed since you started editing. Would you like to create a new branch?"
msgstr ""
......@@ -2439,6 +2537,9 @@ msgstr ""
msgid "This merge request is locked."
msgstr ""
msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here."
msgstr ""
msgid "Time before an issue gets scheduled"
msgstr ""
......@@ -2587,6 +2688,9 @@ msgstr[1] ""
msgid "Time|s"
msgstr ""
msgid "Title"
msgstr ""
msgid "Total Time"
msgstr ""
......@@ -2596,7 +2700,13 @@ msgstr ""
msgid "Total test time for all commits/merges"
msgstr ""
msgid "Total test time for all commits/merges"
msgid "Track activity with Contribution Analytics."
msgstr ""
msgid "Track groups of issues that share a theme, across projects and milestones"
msgstr ""
msgid "Turn on Service Desk"
msgstr ""
msgid "Unlock"
......@@ -2611,6 +2721,21 @@ msgstr ""
msgid "Unsubscribe"
msgstr ""
msgid "Upgrade your plan to activate Advanced Global Search."
msgstr ""
msgid "Upgrade your plan to activate Contribution Analytics."
msgstr ""
msgid "Upgrade your plan to activate Group Webhooks."
msgstr ""
msgid "Upgrade your plan to activate Issue weight."
msgstr ""
msgid "Upgrade your plan to improve Issue boards."
msgstr ""
msgid "Upload New File"
msgstr ""
......@@ -2620,6 +2745,9 @@ msgstr ""
msgid "UploadLink|click to upload"
msgstr ""
msgid "Use Service Desk to connect with your users (e.g. to offer customer support) through email right inside GitLab"
msgstr ""
msgid "Use the following registration token during setup:"
msgstr ""
......@@ -2653,6 +2781,15 @@ msgstr ""
msgid "We don't have enough data to show this stage."
msgstr ""
msgid "We want to be sure it is you, please confirm you are not a robot."
msgstr ""
msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
msgstr ""
msgid "Weight"
msgstr ""
msgid "When access to a storage fails. GitLab will prevent access to the storage for the time specified here. This allows the filesystem to recover. Repositories on failing shards are temporarly unavailable"
msgstr ""
......@@ -2758,6 +2895,9 @@ msgstr ""
msgid "Wiki|Wiki Pages"
msgstr ""
msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members."
msgstr ""
msgid "Withdraw Access Request"
msgstr ""
......@@ -2773,10 +2913,10 @@ msgstr ""
msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?"
msgstr ""
msgid "You are on a read-only GitLab instance."
msgid "You can only add files when you are on a branch"
msgstr ""
msgid "You can only add files when you are on a branch"
msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
msgstr ""
msgid "You cannot write to this read-only GitLab instance."
......@@ -2830,7 +2970,10 @@ msgstr ""
msgid "branch name"
msgstr ""
msgid "branch name"
msgid "by"
msgstr ""
msgid "commit"
msgstr ""
msgid "day"
......@@ -2858,7 +3001,7 @@ msgstr ""
msgid "source"
msgstr ""
msgid "source"
msgid "to help your contributors communicate effectively!"
msgstr ""
msgid "username"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7