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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
700eec66
Commit
700eec66
authored
Apr 11, 2012
by
Kei Kubo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added = preserve to some pre statements
parent
51ca0abf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+3
-2
app/views/merge_requests/_how_to_merge.html.haml
app/views/merge_requests/_how_to_merge.html.haml
+6
-5
No files found.
app/views/errors/gitolite.html.haml
View file @
700eec66
...
@@ -14,5 +14,6 @@
...
@@ -14,5 +14,6 @@
%p
%p
Try:
Try:
%pre
%pre
sudo chmod -R 770 /home/git/repositories/
=
preserve
do
sudo chown -R git:git /home/git/repositories/
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
app/views/merge_requests/_how_to_merge.html.haml
View file @
700eec66
...
@@ -4,11 +4,12 @@
...
@@ -4,11 +4,12 @@
%h3
How To Merge
%h3
How To Merge
.modal-body
.modal-body
%pre
%pre
:erb
=
preserve
do
git checkout
<%=
@merge_request
.
target_branch
%>
:erb
git fetch origin
git checkout
<%=
@merge_request
.
target_branch
%>
git merge origin/
<%=
@merge_request
.
source_branch
%>
git fetch origin
git push origin
<%=
@merge_request
.
target_branch
%>
git merge origin/
<%=
@merge_request
.
source_branch
%>
git push origin
<%=
@merge_request
.
target_branch
%>
:javascript
:javascript
...
...
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