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
bb5e50e0
Commit
bb5e50e0
authored
Aug 05, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix edit files
parent
b9265566
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects/edit_tree_controller.rb
app/controllers/projects/edit_tree_controller.rb
+1
-1
lib/gitlab/satellite/edit_file_action.rb
lib/gitlab/satellite/edit_file_action.rb
+1
-1
No files found.
app/controllers/projects/edit_tree_controller.rb
View file @
bb5e50e0
...
@@ -10,7 +10,7 @@ class Projects::EditTreeController < Projects::ApplicationController
...
@@ -10,7 +10,7 @@ class Projects::EditTreeController < Projects::ApplicationController
before_filter
:edit_requirements
,
only:
[
:show
,
:update
]
before_filter
:edit_requirements
,
only:
[
:show
,
:update
]
def
show
def
show
@last_commit
=
@project
.
repository
.
last_commit_for
(
@ref
,
@path
).
sha
@last_commit
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@project
.
repository
,
@ref
,
@path
).
sha
end
end
def
update
def
update
...
...
lib/gitlab/satellite/edit_file_action.rb
View file @
bb5e50e0
...
@@ -49,7 +49,7 @@ module Gitlab
...
@@ -49,7 +49,7 @@ module Gitlab
protected
protected
def
can_edit?
(
last_commit
)
def
can_edit?
(
last_commit
)
current_last_commit
=
@project
.
repository
.
last_commit_for
(
ref
,
file_path
).
sha
current_last_commit
=
Gitlab
::
Git
::
Commit
.
last_for_path
(
@project
.
repository
,
ref
,
file_path
).
sha
last_commit
==
current_last_commit
last_commit
==
current_last_commit
end
end
end
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