diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 19:31:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-19 21:49:35 +0200 |
| commit | 1488be7d9683fb3442c6f7bd4fd911d224f0c929 (patch) | |
| tree | 42548a596bb118e08c14c4d0ae9eacb3e8b2f36b /config/routes.rb | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
| parent | d22f3a7d5140ef1c3ae6e9bd2241bbb5289af8d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb index 160640e0e..789b5f502 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -435,9 +435,10 @@ Rails.application.routes.draw do get '/web/(*any)', to: 'home#index', as: :web - get '/about', to: 'about#show' - get '/about/more', to: 'about#more' - get '/terms', to: 'about#terms' + get '/about', to: 'about#show' + get '/about/more', to: 'about#more' + get '/about/blocks', to: 'about#blocks' + get '/terms', to: 'about#terms' root 'home#index' |