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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
41a2fd7c
Commit
41a2fd7c
authored
9 years ago
by
Douwe Maan
Committed by
Robert Speicher
9 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape user-provided content in preserved HAML sections
parent
348b983a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+3
-3
app/views/projects/merge_requests/show/_how_to_merge.html.haml
...iews/projects/merge_requests/show/_how_to_merge.html.haml
+8
-8
app/views/projects/wikis/git_access.html.haml
app/views/projects/wikis/git_access.html.haml
+1
-1
No files found.
app/views/projects/empty.html.haml
View file @
41a2fd7c
...
@@ -22,15 +22,15 @@
...
@@ -22,15 +22,15 @@
%h5
Git global setup
%h5
Git global setup
%pre
.light-well
%pre
.light-well
:preserve
:preserve
git config --global user.name "
#{
git_user_name
}
"
git config --global user.name "
#{
h
git_user_name
}
"
git config --global user.email "
#{
git_user_email
}
"
git config --global user.email "
#{
h
git_user_email
}
"
%fieldset
%fieldset
%h5
Create a new repository
%h5
Create a new repository
%pre
.light-well
%pre
.light-well
:preserve
:preserve
git clone
#{
content_tag
(
:span
,
default_url_to_repo
,
class:
'clone'
)
}
git clone
#{
content_tag
(
:span
,
default_url_to_repo
,
class:
'clone'
)
}
cd
#{
@project
.
path
}
cd
#{
h
@project
.
path
}
touch README.md
touch README.md
git add README.md
git add README.md
git commit -m "add README"
git commit -m "add README"
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_how_to_merge.html.haml
View file @
41a2fd7c
...
@@ -11,12 +11,12 @@
...
@@ -11,12 +11,12 @@
%pre
.dark
%pre
.dark
-
if
@merge_request
.
for_fork?
-
if
@merge_request
.
for_fork?
:preserve
:preserve
git fetch
#{
@merge_request
.
source_project
.
http_url_to_repo
}
#{
@merge_request
.
source_branch
}
git fetch
#{
h
@merge_request
.
source_project
.
http_url_to_repo
}
#{
h
@merge_request
.
source_branch
}
git checkout -b
#{
@merge_request
.
source_project_path
}
-
#{
@merge_request
.
source_branch
}
FETCH_HEAD
git checkout -b
#{
h
@merge_request
.
source_project_path
}
-
#{
h
@merge_request
.
source_branch
}
FETCH_HEAD
-
else
-
else
:preserve
:preserve
git fetch origin
git fetch origin
git checkout -b
#{
@merge_request
.
source_branch
}
origin/
#{
@merge_request
.
source_branch
}
git checkout -b
#{
h
@merge_request
.
source_branch
}
origin/
#{
h
@merge_request
.
source_branch
}
%p
%p
%strong
Step 2.
%strong
Step 2.
Review the changes locally
Review the changes locally
...
@@ -27,18 +27,18 @@
...
@@ -27,18 +27,18 @@
%pre
.dark
%pre
.dark
-
if
@merge_request
.
for_fork?
-
if
@merge_request
.
for_fork?
:preserve
:preserve
git checkout
#{
@merge_request
.
target_branch
}
git checkout
#{
h
@merge_request
.
target_branch
}
git merge --no-ff
#{
@merge_request
.
source_project_path
}
-
#{
@merge_request
.
source_branch
}
git merge --no-ff
#{
h
@merge_request
.
source_project_path
}
-
#{
h
@merge_request
.
source_branch
}
-
else
-
else
:preserve
:preserve
git checkout
#{
@merge_request
.
target_branch
}
git checkout
#{
h
@merge_request
.
target_branch
}
git merge --no-ff
#{
@merge_request
.
source_branch
}
git merge --no-ff
#{
h
@merge_request
.
source_branch
}
%p
%p
%strong
Step 4.
%strong
Step 4.
Push the result of the merge to GitLab
Push the result of the merge to GitLab
%pre
.dark
%pre
.dark
:preserve
:preserve
git push origin
#{
@merge_request
.
target_branch
}
git push origin
#{
h
@merge_request
.
target_branch
}
-
unless
@merge_request
.
can_be_merged_by?
(
current_user
)
-
unless
@merge_request
.
can_be_merged_by?
(
current_user
)
%p
%p
Note that pushing to GitLab requires write access to this repository.
Note that pushing to GitLab requires write access to this repository.
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/wikis/git_access.html.haml
View file @
41a2fd7c
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
%pre
.dark
%pre
.dark
:preserve
:preserve
git clone
#{
content_tag
(
:span
,
default_url_to_repo
(
@project_wiki
),
class:
'clone'
)
}
git clone
#{
content_tag
(
:span
,
default_url_to_repo
(
@project_wiki
),
class:
'clone'
)
}
cd
#{
@project_wiki
.
path
}
cd
#{
h
@project_wiki
.
path
}
%legend
Start Gollum And Edit Locally:
%legend
Start Gollum And Edit Locally:
%pre
.dark
%pre
.dark
...
...
This diff is collapsed.
Click to expand it.
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