Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
855d6c50
Commit
855d6c50
authored
Oct 30, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve merge conflicts
parent
253ca816
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
26 deletions
+3
-26
locale/gitlab.pot
locale/gitlab.pot
+3
-22
spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
.../components/sidebar/collapsed_grouped_date_picker_spec.js
+0
-4
No files found.
locale/gitlab.pot
View file @
855d6c50
...
@@ -775,12 +775,9 @@ msgstr ""
...
@@ -775,12 +775,9 @@ msgstr ""
msgid "Are you sure you want to stop this environment?"
msgid "Are you sure you want to stop this environment?"
msgstr ""
msgstr ""
<<<<<<< HEAD
msgid "Are you sure you want to unlock %{path_lock_path}?"
msgid "Are you sure you want to unlock %{path_lock_path}?"
msgstr ""
msgstr ""
=======
>>>>>>> upstream/master
msgid "Are you sure?"
msgid "Are you sure?"
msgstr ""
msgstr ""
...
@@ -2704,15 +2701,6 @@ msgid "DeployTokens|Your new project deploy token has been created."
...
@@ -2704,15 +2701,6 @@ msgid "DeployTokens|Your new project deploy token has been created."
msgstr ""
msgstr ""
msgid "Deployed to"
msgid "Deployed to"
<<<<<<< HEAD
=======
msgstr ""
msgid "Deploying to"
msgstr ""
msgid "Deprioritize label"
>>>>>>> upstream/master
msgstr ""
msgstr ""
msgid "Deploying to"
msgid "Deploying to"
...
@@ -7266,12 +7254,9 @@ msgstr ""
...
@@ -7266,12 +7254,9 @@ msgstr ""
msgid "Something went wrong while fetching comments. Please try again."
msgid "Something went wrong while fetching comments. Please try again."
msgstr ""
msgstr ""
<<<<<<< HEAD
msgid "Something went wrong while fetching group member contributions"
msgid "Something went wrong while fetching group member contributions"
msgstr ""
msgstr ""
=======
>>>>>>> upstream/master
msgid "Something went wrong while fetching the environments for this merge request. Please try again."
msgid "Something went wrong while fetching the environments for this merge request. Please try again."
msgstr ""
msgstr ""
...
@@ -7467,12 +7452,9 @@ msgstr ""
...
@@ -7467,12 +7452,9 @@ msgstr ""
msgid "Start a %{new_merge_request} with these changes"
msgid "Start a %{new_merge_request} with these changes"
msgstr ""
msgstr ""
<<<<<<< HEAD
msgid "Start a review"
msgid "Start a review"
msgstr ""
msgstr ""
=======
>>>>>>> upstream/master
msgid "Start and due date"
msgid "Start and due date"
msgstr ""
msgstr ""
...
@@ -8880,11 +8862,10 @@ msgstr ""
...
@@ -8880,11 +8862,10 @@ msgstr ""
msgid "You can set up jobs to only use Runners with specific tags. Separate tags with commas."
msgid "You can set up jobs to only use Runners with specific tags. Separate tags with commas."
msgstr ""
msgstr ""
<<<<<<< HEAD
msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
=======
msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
>>>>>>> upstream/master
msgstr ""
msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
msgstr ""
msgstr ""
msgid "You cannot write to this read-only GitLab instance."
msgid "You cannot write to this read-only GitLab instance."
...
...
spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
View file @
855d6c50
...
@@ -77,11 +77,7 @@ describe('collapsedGroupedDatePicker', () => {
...
@@ -77,11 +77,7 @@ describe('collapsedGroupedDatePicker', () => {
expect
(
icons
[
0
].
innerText
.
trim
()).
toEqual
(
'
None
'
);
expect
(
icons
[
0
].
innerText
.
trim
()).
toEqual
(
'
None
'
);
});
});
<<<<<<<
HEAD
it
(
'
should have tooltip as `Start and due dates`
'
,
()
=>
{
=======
it
(
'
should have tooltip as `Start and due date`
'
,
()
=>
{
it
(
'
should have tooltip as `Start and due date`
'
,
()
=>
{
>>>>>>>
upstream
/
master
const
icons
=
vm
.
$el
.
querySelectorAll
(
'
.sidebar-collapsed-icon
'
);
const
icons
=
vm
.
$el
.
querySelectorAll
(
'
.sidebar-collapsed-icon
'
);
expect
(
icons
[
0
].
dataset
.
originalTitle
).
toBe
(
'
Start and due date
'
);
expect
(
icons
[
0
].
dataset
.
originalTitle
).
toBe
(
'
Start and due date
'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment