Allow branch names ending with .json for graph and network page (!5579)
This commit is contained in:
parent
010477edc0
commit
e1832914df
3 changed files with 12 additions and 7 deletions
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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/ }
|
||||
# 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: /(?:[^.]|\.(?!json$))+/, format: /json/ } do
|
||||
member do
|
||||
get :commits
|
||||
get :ci
|
||||
get :languages
|
||||
resources :graphs, only: [:show], constraints: { id: Gitlab::Regex.git_reference_regex } do
|
||||
member do
|
||||
get :commits
|
||||
get :ci
|
||||
get :languages
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue