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
e2881cb7
Commit
e2881cb7
authored
Oct 01, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'flevour/gitlab-ce-fix-merge-request-textareas'
parents
41b08e4a
d8b71ed8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
CHANGELOG
CHANGELOG
+1
-0
app/views/layouts/_init_auto_complete.html.haml
app/views/layouts/_init_auto_complete.html.haml
+2
-1
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+3
-2
No files found.
CHANGELOG
View file @
e2881cb7
...
@@ -106,6 +106,7 @@ v 8.0.0
...
@@ -106,6 +106,7 @@ v 8.0.0
- Webhook for issue now contains repository field (Jungkook Park)
- Webhook for issue now contains repository field (Jungkook Park)
- Add ability to add custom text to the help page (Jeroen van Baarsen)
- Add ability to add custom text to the help page (Jeroen van Baarsen)
- Add pg_schema to backup config
- Add pg_schema to backup config
- Fix references to target project issues in Merge Requests markdown preview and textareas (Francesco Levorato)
- Redirect from incorrectly cased group or project path to correct one (Francesco Levorato)
- Redirect from incorrectly cased group or project path to correct one (Francesco Levorato)
- Removed API calls from CE to CI
- Removed API calls from CE to CI
...
...
app/views/layouts/_init_auto_complete.html.haml
View file @
e2881cb7
-
project
=
@target_project
||
@project
:javascript
:javascript
GitLab
.
GfmAutoComplete
.
dataSource
=
"
#{
autocomplete_sources_namespace_project_path
(
@project
.
namespace
,
@
project
,
type:
@noteable
.
class
,
type_id:
params
[
:id
])
}
"
GitLab
.
GfmAutoComplete
.
dataSource
=
"
#{
autocomplete_sources_namespace_project_path
(
project
.
namespace
,
project
,
type:
@noteable
.
class
,
type_id:
params
[
:id
])
}
"
GitLab
.
GfmAutoComplete
.
setup
();
GitLab
.
GfmAutoComplete
.
setup
();
app/views/layouts/project.html.haml
View file @
e2881cb7
...
@@ -3,10 +3,11 @@
...
@@ -3,10 +3,11 @@
-
sidebar
"project"
unless
sidebar
-
sidebar
"project"
unless
sidebar
-
content_for
:scripts_body_top
do
-
content_for
:scripts_body_top
do
-
project
=
@target_project
||
@project
-
if
current_user
-
if
current_user
:javascript
:javascript
window
.
project_uploads_path
=
"
#{
namespace_project_uploads_path
@project
.
namespace
,
@
project
}
"
;
window
.
project_uploads_path
=
"
#{
namespace_project_uploads_path
project
.
namespace
,
project
}
"
;
window
.
markdown_preview_path
=
"
#{
markdown_preview_namespace_project_path
(
@project
.
namespace
,
@
project
)
}
"
;
window
.
markdown_preview_path
=
"
#{
markdown_preview_namespace_project_path
(
project
.
namespace
,
project
)
}
"
;
-
content_for
:scripts_body
do
-
content_for
:scripts_body
do
=
render
"layouts/init_auto_complete"
if
current_user
=
render
"layouts/init_auto_complete"
if
current_user
...
...
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