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
2ccd60da
Commit
2ccd60da
authored
Jun 03, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes wrong conflicys resolving
parent
684e9d1b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
12 deletions
+0
-12
app/models/project.rb
app/models/project.rb
+0
-2
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
+0
-10
No files found.
app/models/project.rb
View file @
2ccd60da
...
...
@@ -1216,8 +1216,6 @@ class Project < ActiveRecord::Base
import_url_changed?
&&
changes
[
'import_url'
].
first
end
private
def
update_forks_visibility_level
return
unless
visibility_level
<
visibility_level_was
...
...
spec/lib/banzai/filter/milestone_reference_filter_spec.rb
View file @
2ccd60da
...
...
@@ -48,11 +48,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
namespace_project_milestone_path
(
project
.
namespace
,
project
,
milestone
)
end
it
'adds to the results hash'
do
result
=
reference_pipeline_result
(
"Milestone
#{
reference
}
"
)
expect
(
result
[
:references
][
:milestone
]).
to
eq
[
milestone
]
end
context
'Integer-based references'
do
it
'links to a valid reference'
do
doc
=
reference_filter
(
"See
#{
reference
}
"
)
...
...
@@ -168,11 +163,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
milestone
)
end
it
'adds to the results hash'
do
result
=
reference_pipeline_result
(
"Milestone
#{
reference
}
"
)
expect
(
result
[
:references
][
:milestone
]).
to
eq
[
milestone
]
end
it
'contains cross project content'
do
expect
(
result
.
css
(
'a'
).
first
.
text
).
to
eq
"
#{
milestone
.
name
}
in
#{
project_path
}
"
end
...
...
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