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
Boxiang Sun
gitlab-ce
Commits
e1832914
Commit
e1832914
authored
Jul 31, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow branch names ending with .json for graph and network page (!5579)
parent
010477ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
8 deletions
+13
-8
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/graphs/show.html.haml
app/views/projects/graphs/show.html.haml
+1
-1
config/routes.rb
config/routes.rb
+11
-7
No files found.
CHANGELOG
View file @
e1832914
...
...
@@ -34,6 +34,7 @@ v 8.11.0 (unreleased)
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Fix search for notes which belongs to deleted objects
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
- Allow branch names ending with .json for graph and network page !5579 (winniehell)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
- Profile requests when a header is passed
...
...
app/views/projects/graphs/show.html.haml
View file @
e1832914
...
...
@@ -32,7 +32,7 @@
:javascript
$
.
ajax
({
type
:
"
GET
"
,
url
:
"
#{
namespace_project_graph_path
(
@project
.
namespace
,
@project
,
current_ref
,
:json
)
}
"
,
url
:
"
#{
namespace_project_graph_path
(
@project
.
namespace
,
@project
,
current_ref
,
format:
:json
)
}
"
,
dataType
:
"
json
"
,
success
:
function
(
data
)
{
var
graph
=
new
ContributorsStatGraph
();
...
...
config/routes.rb
View file @
e1832914
...
...
@@ -626,13 +626,17 @@ Rails.application.routes.draw do
get
'/compare/:from...:to'
,
to:
'compare#show'
,
as:
'compare'
,
constraints:
{
from:
/.+/
,
to:
/.+/
}
resources
:network
,
only:
[
:show
],
constraints:
{
id:
/(?:[^.]|\.(?!json$))+/
,
format:
/json/
}
resources
:graphs
,
only:
[
:show
],
constraints:
{
id:
/(?:[^.]|\.(?!json$))+/
,
format:
/json/
}
do
member
do
get
:commits
get
:ci
get
:languages
# Don't use format parameter as file extension (old 3.0.x behavior)
# See http://guides.rubyonrails.org/routing.html#route-globbing-and-wildcard-segments
scope
format:
false
do
resources
:network
,
only:
[
:show
],
constraints:
{
id:
Gitlab
::
Regex
.
git_reference_regex
}
resources
:graphs
,
only:
[
:show
],
constraints:
{
id:
Gitlab
::
Regex
.
git_reference_regex
}
do
member
do
get
:commits
get
:ci
get
:languages
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