Loading Changelog.md +1 −0 Original line number Diff line number Diff line Loading @@ -117,6 +117,7 @@ before. * Use handlebars template for aspect membership dropdown [#6864](https://github.com/diaspora/diaspora/pull/6864) * Extract relayable signatures into their own tables [#6932](https://github.com/diaspora/diaspora/pull/6932) * Remove outdated columns from posts table [#6940](https://github.com/diaspora/diaspora/pull/6940) * Remove some unused routes [#6781](https://github.com/diaspora/diaspora/pull/6781) ## Bug fixes * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) Loading config/routes.rb +11 −23 Original line number Diff line number Diff line Loading @@ -7,7 +7,7 @@ require "sidekiq/cron/web" Diaspora::Application.routes.draw do resources :report, :except => [:edit, :new] resources :report, except: %i(edit new show) if Rails.env.production? mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin' Loading @@ -25,11 +25,11 @@ Diaspora::Application.routes.draw do get 'oembed' => 'posts#oembed', :as => 'oembed' # Posting and Reading resources :reshares resources :reshares, only: %i(create) resources :status_messages, :only => [:new, :create] resources :posts do resources :posts, only: %i(show destroy) do member do get :interactions end Loading Loading @@ -57,7 +57,7 @@ Diaspora::Application.routes.draw do get "commented" => "streams#commented", :as => "commented_stream" get "aspects" => "streams#aspects", :as => "aspects_stream" resources :aspects do resources :aspects, except: %i(index new edit) do put :toggle_contact_visibility put :toggle_chat_privilege collection do Loading @@ -67,15 +67,15 @@ Diaspora::Application.routes.draw do get 'bookmarklet' => 'status_messages#bookmarklet' resources :photos, :except => [:index, :show] do resources :photos, only: %i(destroy create) do put :make_profile_photo end #Search get 'search' => "search#search" resources :conversations do resources :messages, :only => [:create, :show] resources :conversations, except: %i(edit update destroy) do resources :messages, only: %i(create) delete 'visibility' => 'conversation_visibilities#destroy' end Loading @@ -96,8 +96,6 @@ Diaspora::Application.routes.draw do get 'tags/:name' => 'tags#show', :as => 'tag' resources :apps, :only => [:show] # Users and people resource :user, :only => [:edit, :update, :destroy], :shallow => true do Loading Loading @@ -156,8 +154,7 @@ Diaspora::Application.routes.draw do resources :profiles, :only => [:show] resources :contacts, :except => [:update, :create] do end resources :contacts, only: %i(index) resources :aspect_memberships, :only => [:destroy, :create] resources :share_visibilities, :only => [:update] resources :blocks, :only => [:create, :destroy] Loading @@ -165,20 +162,15 @@ Diaspora::Application.routes.draw do get 'i/:id' => 'invitation_codes#show', :as => 'invite_code' get 'people/refresh_search' => "people#refresh_search" resources :people, :except => [:edit, :update] do resources :status_messages resources :photos resources :people, only: %i(show index) do resources :status_messages, only: %i(new create) resources :photos, except: %i(new update) get :contacts get :stream get :hovercard member do get :last_post end collection do post 'by_handle' => :retrieve_remote, :as => 'person_by_handle' get :tag_index end end get '/u/:username' => 'people#show', :as => 'user_profile', :constraints => { :username => /[^\/]+/ } Loading Loading @@ -230,10 +222,6 @@ Diaspora::Application.routes.draw do root :to => 'home#show' get "podmin", to: "home#podmin" api_version(module: "Api::V0", path: {value: "api/v0"}, default: true) do match "user", to: "users#show", via: %i(get post) end namespace :api do namespace :openid_connect do resources :clients, only: :create Loading Loading
Changelog.md +1 −0 Original line number Diff line number Diff line Loading @@ -117,6 +117,7 @@ before. * Use handlebars template for aspect membership dropdown [#6864](https://github.com/diaspora/diaspora/pull/6864) * Extract relayable signatures into their own tables [#6932](https://github.com/diaspora/diaspora/pull/6932) * Remove outdated columns from posts table [#6940](https://github.com/diaspora/diaspora/pull/6940) * Remove some unused routes [#6781](https://github.com/diaspora/diaspora/pull/6781) ## Bug fixes * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) Loading
config/routes.rb +11 −23 Original line number Diff line number Diff line Loading @@ -7,7 +7,7 @@ require "sidekiq/cron/web" Diaspora::Application.routes.draw do resources :report, :except => [:edit, :new] resources :report, except: %i(edit new show) if Rails.env.production? mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin' Loading @@ -25,11 +25,11 @@ Diaspora::Application.routes.draw do get 'oembed' => 'posts#oembed', :as => 'oembed' # Posting and Reading resources :reshares resources :reshares, only: %i(create) resources :status_messages, :only => [:new, :create] resources :posts do resources :posts, only: %i(show destroy) do member do get :interactions end Loading Loading @@ -57,7 +57,7 @@ Diaspora::Application.routes.draw do get "commented" => "streams#commented", :as => "commented_stream" get "aspects" => "streams#aspects", :as => "aspects_stream" resources :aspects do resources :aspects, except: %i(index new edit) do put :toggle_contact_visibility put :toggle_chat_privilege collection do Loading @@ -67,15 +67,15 @@ Diaspora::Application.routes.draw do get 'bookmarklet' => 'status_messages#bookmarklet' resources :photos, :except => [:index, :show] do resources :photos, only: %i(destroy create) do put :make_profile_photo end #Search get 'search' => "search#search" resources :conversations do resources :messages, :only => [:create, :show] resources :conversations, except: %i(edit update destroy) do resources :messages, only: %i(create) delete 'visibility' => 'conversation_visibilities#destroy' end Loading @@ -96,8 +96,6 @@ Diaspora::Application.routes.draw do get 'tags/:name' => 'tags#show', :as => 'tag' resources :apps, :only => [:show] # Users and people resource :user, :only => [:edit, :update, :destroy], :shallow => true do Loading Loading @@ -156,8 +154,7 @@ Diaspora::Application.routes.draw do resources :profiles, :only => [:show] resources :contacts, :except => [:update, :create] do end resources :contacts, only: %i(index) resources :aspect_memberships, :only => [:destroy, :create] resources :share_visibilities, :only => [:update] resources :blocks, :only => [:create, :destroy] Loading @@ -165,20 +162,15 @@ Diaspora::Application.routes.draw do get 'i/:id' => 'invitation_codes#show', :as => 'invite_code' get 'people/refresh_search' => "people#refresh_search" resources :people, :except => [:edit, :update] do resources :status_messages resources :photos resources :people, only: %i(show index) do resources :status_messages, only: %i(new create) resources :photos, except: %i(new update) get :contacts get :stream get :hovercard member do get :last_post end collection do post 'by_handle' => :retrieve_remote, :as => 'person_by_handle' get :tag_index end end get '/u/:username' => 'people#show', :as => 'user_profile', :constraints => { :username => /[^\/]+/ } Loading Loading @@ -230,10 +222,6 @@ Diaspora::Application.routes.draw do root :to => 'home#show' get "podmin", to: "home#podmin" api_version(module: "Api::V0", path: {value: "api/v0"}, default: true) do match "user", to: "users#show", via: %i(get post) end namespace :api do namespace :openid_connect do resources :clients, only: :create Loading