Download as
Browse Code »

Commit 50f322d8b49728a6b1da02580ed0a6f23f9cea14

Authored by Rafael Manzo
1 parent 5d29ba11

Revert "[Colab] Routes scoped as expected by colab with '/mezuro'" 

This reverts commit f2788c39f2f09cbb4e00fe26123a6fdca254435b.

The right way to set the subdirectory is by setting the Rack mount on config.ru
or on the webserver like apache or nginx.
Showing 2 changed files with 31 additions and 34 deletions   Show diff stats
config/environments/colab.rb
  Diff comments   View file @50f322d
... ... @@ -47,5 +47,4 @@ Rails.application.configure do
47 47  
48 48 # Responds on a subdirectory
49 49 config.relative_url_root = '/mezuro'
50   - config.assets.prefix = '/mezuro'
51 50 end
... ...
config/routes.rb
  Diff comments   View file @50f322d
1 1 Rails.application.routes.draw do
2   - scope "mezuro" do
3   - scope "(:locale)", locale: /en|pt/ do
4   - # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope
5   - devise_for :users, skip: :omniauth_callbacks
6   - get 'users/:user_id/projects' => 'users#projects', as: :user_projects
7   -
8   - resources :projects do
9   - resources :repositories, only: [:new, :create]
10   - end
  2 + scope "(:locale)", locale: /en|pt/ do
  3 + # We need to manually define OmniAuth routes since the automatic generation does not support the dynamic scope
  4 + devise_for :users, skip: :omniauth_callbacks
  5 + get 'users/:user_id/projects' => 'users#projects', as: :user_projects
  6 +
  7 + resources :projects do
  8 + resources :repositories, only: [:new, :create]
  9 + end
11 10  
12 11 resources :repositories, except: [:update]
13 12 get '/repositories/:id/modules/:module_result_id' => 'repositories#show', as: :repository_module
... ... @@ -19,40 +18,39 @@ Rails.application.routes.draw do
19 18  
20 19 get '/repository_branches' => 'repositories#branches', as: :repository_branches
21 20  
22   - resources :kalibro_configurations do
23   - get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric
24   - resources :metric_configurations, except: [:update, :new] do
25   - get '/kalibro_ranges/new' => 'kalibro_ranges#new', as: :new_kalibro_range
26   - resources :kalibro_ranges, except: [:update, :new]
27   - put '/kalibro_ranges/:id' => 'kalibro_ranges#update', as: :kalibro_range_update
28   - end
29   - post '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration
30   - put '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update
31   -
32   - resources :compound_metric_configurations, except: [:destroy, :update]
33   - put '/compound_metric_configurations/:id' => 'compound_metric_configurations#update', as: :compound_metric_configuration_update
  21 + resources :kalibro_configurations do
  22 + get '/metric_configurations/choose_metric' => 'metric_configurations#choose_metric', as: :choose_metric
  23 + resources :metric_configurations, except: [:update, :new] do
  24 + get '/kalibro_ranges/new' => 'kalibro_ranges#new', as: :new_kalibro_range
  25 + resources :kalibro_ranges, except: [:update, :new]
  26 + put '/kalibro_ranges/:id' => 'kalibro_ranges#update', as: :kalibro_range_update
34 27 end
  28 + post '/metric_configurations/new' => 'metric_configurations#new', as: :new_metric_configuration
  29 + put '/metric_configurations/:id' => 'metric_configurations#update', as: :metric_configuration_update
35 30  
36   - resources :reading_groups do
37   - resources :readings, except: [:index, :update, :show]
38   - put '/readings/:id' => 'readings#update', as: :reading_update
39   - end
  31 + resources :compound_metric_configurations, except: [:destroy, :update]
  32 + put '/compound_metric_configurations/:id' => 'compound_metric_configurations#update', as: :compound_metric_configuration_update
  33 + end
  34 +
  35 + resources :reading_groups do
  36 + resources :readings, except: [:index, :update, :show]
  37 + put '/readings/:id' => 'readings#update', as: :reading_update
  38 + end
40 39  
41 40 # Modules
42   - #resources :modules
43   - post '/modules/:id/metric_history' => 'modules#metric_history'
44   - post '/modules/:id/tree' => 'modules#load_module_tree'
  41 + #resources :modules
  42 + post '/modules/:id/metric_history' => 'modules#metric_history'
  43 + post '/modules/:id/tree' => 'modules#load_module_tree'
45 44  
46   - # Tutorials
47   - get '/tutorials/:name' => 'tutorials#view', as: 'tutorials'
  45 + # Tutorials
  46 + get '/tutorials/:name' => 'tutorials#view', as: 'tutorials'
48 47  
49   - root "home#index"
50   - end
  48 + root "home#index"
51 49 end
52 50  
  51 +
53 52 # See comment above for devise_for
54 53 devise_for :users, only: :omniauth_callbacks, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
55   -
56 54 # The priority is based upon order of creation: first created -> highest priority.
57 55 # See how all your routes lay out with "rake routes".
58 56  
... ...