Renamed /activity route to /activities

3 files changed, 54 insertions, 54 deletions

diff --git a/config/routes.rb b/config/routes.rb
index f7d01d3..0a8f89b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,7 +21,7 @@
 # == ROUTING NOTE =========================================================
 #
 # Note that all routes are getting pre and post processed by the filter class
-# in RAILS_ROOT/lib/route_filters/repository_owner_namespacing.rb and that 
+# in RAILS_ROOT/lib/route_filters/repository_owner_namespacing.rb and that
 # you should be EXTRA CAREFUL when adding a route that doesn't map directly
 # by name to an existing controller or action. In such case the same string
 # should be added to Gitorious::Reservations::unaccounted_root_names
@@ -30,13 +30,13 @@
 
 ActionController::Routing::Routes.draw do |map|
   VALID_REF = /[a-zA-Z0-9~\{\}\+\^\.\-_\/]+/
-  
+
   # Builds up the common repository sub-routes that's shared between projects
   # and user+team namespaced repositories
   def build_repository_routes(repository, options = {})
     repository.with_options(options) do |repo|
       repo.resources :comments
-      repo.commit_comment "comments/commit/:sha", :controller => "comments", 
+      repo.commit_comment "comments/commit/:sha", :controller => "comments",
         :action => "commit", :conditions => { :method => :get }
       repo.comments_preview 'comments/preview', :controller => 'comments',
         :action => 'preview'#, :conditions => {:method => :put}
@@ -44,8 +44,8 @@ ActionController::Routing::Routes.draw do |map|
         :terms_accepted => :get,
         :version => :get,
         :commit_status => :get
-      }, :collection => { 
-        :create => :post, 
+      }, :collection => {
+        :create => :post,
         :commit_list => :post,
         :target_branches => :post,
       } do |merge_request|
@@ -61,7 +61,7 @@ ActionController::Routing::Routes.draw do |map|
 
 
 
-      
+
       repo.formatted_commits_feed "commits/*branch/feed.:format",
           :controller => "commits", :action => "feed", :conditions => {:feed => :get}
       repo.commits        "commits", :controller => "commits", :action => "index"
@@ -81,16 +81,16 @@ ActionController::Routing::Routes.draw do |map|
     :member => {
       :clone => :get, :create_clone => :post,
       :writable_by => :get,
-      :config => :get, 
+      :config => :get,
       :confirm_delete => :get,
       :committers => :get,
       :search_clones => :get
     }
   }
-  
-    
+
+
   map.root :controller => "site", :action => "index"
-  
+
   map.connect "users/activate/:activation_code", :controller => "users", :action => "activate"
   map.connect "users/pending_activation", :controller => "users", :action => "pending_activation"
   map.reset_password "users/reset_password/:token", :controller => "users", :action => "reset_password"
@@ -99,12 +99,12 @@ ActionController::Routing::Routes.draw do |map|
     :forgot_password_create => :post,
     :openid_build => :get,
     :openid_create => :post
-  }, :member => { 
-    :feed => :get, 
-    :password => :get, 
+  }, :member => {
+    :feed => :get,
+    :password => :get,
     :update_password => :put,
     :avatar => :delete,
-    :watchlist => :get      
+    :watchlist => :get
   }) do |user|
     user.with_options({:requirements => {:user_id => /#{User::USERNAME_FORMAT}/i}}) do |user_req|
       user_req.resources :keys
@@ -120,9 +120,9 @@ ActionController::Routing::Routes.draw do |map|
       end
     end
   end
-  
+
   map.resources  :events, :member => {:commits => :get}
-  
+
   map.open_id_complete '/sessions', :controller => "sessions", :action=> "create",:requirements => { :method => :get }
 
 
@@ -149,41 +149,41 @@ ActionController::Routing::Routes.draw do |map|
   end
 
 
-  
+
   map.resource :search
-  
-  map.resources :messages, 
-    :member => {:reply => :post, :read => :put}, 
+
+  map.resources :messages,
+    :member => {:reply => :post, :read => :put},
     :collection => {:auto_complete_for_message_recipients => :get, :sent => :get, :bulk_update => :put, :all => :get}
-  
+
   map.with_options :controller => 'sessions' do |session|
     session.login    '/login',  :action => 'new'
     session.logout   '/logout', :action => 'destroy'
   end
-  
-  map.dashboard "dashboard", :controller => "site", :action => "dashboard"  
+
+  map.dashboard "dashboard", :controller => "site", :action => "dashboard"
   map.about "about", :controller => "site", :action => "about"
   map.faq "about/faq", :controller => "site", :action => "faq"
   map.contact "contact", :controller => "site", :action => "contact"
-  
+
   map.namespace :admin do |admin|
     admin.resources :users, :member => { :suspend => :put, :unsuspend => :put, :reset_password => :put }
     admin.resource :oauth_settings, :path_prefix => "/admin/projects/:project_id"
-    
+
   end
 
   map.resources :favorites
 
-  map.activity "/activity", :controller => "site", :action => "public_timeline"
-  
+  map.activity "/activities", :controller => "site", :action => "public_timeline"
+
   map.merge_request_landing_page '/merge_request_landing_page', :controller => 'merge_requests', :action => 'oauth_return'
-  
+
   map.merge_request_direct_access '/merge_requests/:id', :controller => 'merge_requests', :action => 'direct_access'
-  
+
   # Install the default route as the lowest priority.
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
-    
+
   # See the routing_filter plugin and lib/route_filters/*
   map.filter "repository_owner_namespacing", :file => "route_filters/repository_owner_namespacing"
 end
diff --git a/lib/gitorious/reservations.rb b/lib/gitorious/reservations.rb
index f69b86c..6ba2918 100644
--- a/lib/gitorious/reservations.rb
+++ b/lib/gitorious/reservations.rb
@@ -19,33 +19,33 @@ module Gitorious
   class Reservations
     class << self
       def unaccounted_root_names
-        [ "teams", "dashboard", "about", "login", "logout", "commit", 
+        [ "teams", "dashboard", "about", "login", "logout", "commit",
           "commits", "tree", "archive-tarball", "archive-zip", "contact",
-          "register", "signup", "blog", "merge_request_landing_page", "activity" ]
+          "register", "signup", "blog", "merge_request_landing_page", "activities" ]
       end
-      
+
       def reserved_root_names
         @reserved_root_names ||= unaccounted_root_names + Dir[File.join(RAILS_ROOT, "public", "*")].map{|f| File.basename(f) }
       end
-      
+
       def controller_names_plural
         return @controller_names_plural unless @controller_names_plural.blank?
         @controller_names_plural = ActionController::Routing.possible_controllers.map{|s| s.split("/").first }
       end
-      
+
       def controller_names
         return @controller_names unless @controller_names.blank?
         @controller_names = controller_names_plural + controller_names_plural.map{|s| s.singularize }
       end
-      
-      def projects_member_actions 
+
+      def projects_member_actions
         ProjectsController.action_methods.to_a
       end
-    
+
       def project_names
         @project_names ||= reserved_root_names + controller_names
       end
-      
+
       def repository_names
         actions = RepositoriesController.action_methods.to_a
         @repository_names ||= projects_member_actions + controller_names + actions
diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index ad30fbe..36e2693 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -41,18 +41,18 @@ class SiteControllerTest < ActionController::TestCase
       assert_recognizes({
           :controller => "site",
           :action => "public_timeline"
-        }, "/activity")
+        }, "/activities")
     end
-    
+
     should "render the global activity timeline" do
       get :public_timeline
       assert_response :success
       assert_template "site/index"
     end
   end
-  
+
   context "#index" do
-    
+
     context "Logged in users" do
       setup {login_as users(:johan)}
 
@@ -72,7 +72,7 @@ class SiteControllerTest < ActionController::TestCase
           assert_template "site/index"
         end
       end
-      
+
       should "use the funky layout" do
         alter_gitorious_config("is_gitorious_dot_org", true) do
           get :index
@@ -81,14 +81,14 @@ class SiteControllerTest < ActionController::TestCase
         end
       end
     end
-    
+
     should "not use https if not configured to use https" do
       SslRequirement.expects(:disable_ssl_check?).returns(true).at_least_once
       get :index
       assert_response :success
       assert_select 'form#big_header_login_box_form[action=/sessions]'
     end
-    
+
     should "use https to login if configured" do
       SslRequirement.expects(:disable_ssl_check?).returns(false).at_least_once
       SslRequirement.expects(:ssl_host).returns("foo.gitorious.org").at_least_once
@@ -96,13 +96,13 @@ class SiteControllerTest < ActionController::TestCase
       assert_response :success
       assert_select 'form#big_header_login_box_form[action=https://foo.gitorious.org/sessions]'
     end
-    
+
     should "gets a list of the most recent projects" do
       get :index
       assert assigns(:projects).is_a?(Array)
     end
   end
-  
+
   context "#index, with a non-default site" do
     setup do
       paths = ActionController::Base.view_paths
@@ -110,39 +110,39 @@ class SiteControllerTest < ActionController::TestCase
       ActionController::Base.view_paths = paths
       @site = sites(:qt)
     end
-    
+
     should "render the Site specific template" do
       @request.host = "#{@site.subdomain}.gitorious.test"
       get :index
       assert_response :success
       assert_template "#{@site.subdomain}/index"
     end
-    
+
     should "scope the projects to the current site" do
       @request.host = "#{@site.subdomain}.gitorious.test"
       get :index
       assert_equal @site.projects, assigns(:projects)
     end
   end
-  
+
   context "#dashboard" do
     setup do
       login_as :johan
     end
-    
+
     should "requires login" do
       login_as nil
       get :dashboard
       assert_redirected_to(new_sessions_path)
     end
-    
+
     should "redirects to the user page" do
       get :dashboard
       assert_response :redirect
       assert_redirected_to user_path(users(:johan))
     end
   end
-  
+
   context "in Private Mode" do
     setup do
       GitoriousConfig['public_mode'] = false