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
e7e13084
Commit
e7e13084
authored
May 29, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in spec/models/project_services/jira_service_spec.rb
parent
89159405
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
17 deletions
+0
-17
spec/models/project_services/jira_service_spec.rb
spec/models/project_services/jira_service_spec.rb
+0
-17
No files found.
spec/models/project_services/jira_service_spec.rb
View file @
e7e13084
...
...
@@ -263,17 +263,6 @@ describe JiraService, models: true do
}
)
end
<<<<<<<
HEAD
it
"reset password if url changed"
do
@jira_service
.
url
=
'http://jira_edited.example.com/rest/api/2'
@jira_service
.
save
expect
(
@jira_service
.
password
).
to
be_nil
end
it
"does not reset password if username changed"
do
@jira_service
.
username
=
"some_name"
=======
context
'when only web url present'
do
it
'reset password if url changed'
do
...
...
@@ -322,7 +311,6 @@ describe JiraService, models: true do
it
'does not reset password if username changed'
do
@jira_service
.
username
=
'some_name'
>>>>>>>
ce
-
com
/
master
@jira_service
.
save
expect
(
@jira_service
.
password
).
to
eq
(
'password'
)
...
...
@@ -344,13 +332,8 @@ describe JiraService, models: true do
expect
(
@jira_service
.
password
).
to
be_nil
end
end
<<<<<<<
HEAD
context
"when no password was previously set"
do
=======
context
'when no password was previously set'
do
>>>>>>>
ce
-
com
/
master
before
do
@jira_service
=
JiraService
.
create
(
project:
project
,
...
...
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