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
74b5c4da
Commit
74b5c4da
authored
Jun 26, 2018
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bring changes from EE
parent
dd949b0b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/controllers/projects/jobs_controller.rb
app/controllers/projects/jobs_controller.rb
+1
-1
app/controllers/projects/wikis_controller.rb
app/controllers/projects/wikis_controller.rb
+1
-0
No files found.
app/controllers/projects/jobs_controller.rb
View file @
74b5c4da
...
@@ -160,7 +160,7 @@ class Projects::JobsController < Projects::ApplicationController
...
@@ -160,7 +160,7 @@ class Projects::JobsController < Projects::ApplicationController
def
build
def
build
@build
||=
project
.
builds
.
find
(
params
[
:id
])
@build
||=
project
.
builds
.
find
(
params
[
:id
])
.
present
(
current_user:
current_user
)
.
present
(
current_user:
current_user
)
end
end
def
build_path
(
build
)
def
build_path
(
build
)
...
...
app/controllers/projects/wikis_controller.rb
View file @
74b5c4da
...
@@ -95,6 +95,7 @@ class Projects::WikisController < Projects::ApplicationController
...
@@ -95,6 +95,7 @@ class Projects::WikisController < Projects::ApplicationController
def
destroy
def
destroy
@page
=
@project_wiki
.
find_page
(
params
[
:id
])
@page
=
@project_wiki
.
find_page
(
params
[
:id
])
WikiPages
::
DestroyService
.
new
(
@project
,
current_user
).
execute
(
@page
)
WikiPages
::
DestroyService
.
new
(
@project
,
current_user
).
execute
(
@page
)
redirect_to
project_wiki_path
(
@project
,
:home
),
redirect_to
project_wiki_path
(
@project
,
:home
),
...
...
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