diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 59c6d46ed..886ccc4bd 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -24,10 +24,6 @@ class PostsController < ApplicationController end end - def new - redirect_to "/stream" - end - def show mark_corresponding_notification_read if user_signed_in? diff --git a/app/views/status_messages/new_bookmarklet.haml b/app/views/status_messages/new_bookmarklet.haml deleted file mode 100644 index 74c4be115..000000000 --- a/app/views/status_messages/new_bookmarklet.haml +++ /dev/null @@ -1,5 +0,0 @@ --# Copyright (c) 2010-2012, Diaspora Inc. This file is --# licensed under the Affero General Public License version 3 or later. See --# the COPYRIGHT file. - -%iframe{:src =>"/posts/new", :height => 500, :width => 980, :style => "border:none;"} \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6ae77aca4..89f2e91d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,8 +28,6 @@ Diaspora::Application.routes.draw do resources :comments, :only => [:new, :create, :destroy, :index] end - match "/framer" => redirect("/posts/new") - get 'p/:id' => 'posts#show', :as => 'short_post' get 'posts/:id/iframe' => 'posts#iframe', :as => 'iframe' diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index 3ef5e9361..a97ca33ff 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/spec/controllers/status_messages_controller_spec.rb @@ -53,13 +53,6 @@ describe StatusMessagesController do end end - describe '#new_bookmarklet' do - it 'works' do - get :new_bookmarklet - response.should be_success - end - end - describe '#new' do it 'succeeds' do get :new,