From 9a90208a0aa236f165b14a5d18f66aec79cf7676 Mon Sep 17 00:00:00 2001 From: Thomas Kjeldahl Nilsson Date: Thu, 2 Feb 2012 14:58:19 +0100 Subject: [PATCH] Neat-freak-tweak: forgot to update copyright notices in some files. --- app/controllers/site_wiki_pages_controller.rb | 2 +- app/helpers/site_wiki_pages_helper.rb | 3 +-- app/models/site.rb | 6 +++--- test/functional/site_wiki_pages_controller_test.rb | 2 +- test/unit/helpers/site_wiki_pages_helper_test.rb | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/controllers/site_wiki_pages_controller.rb b/app/controllers/site_wiki_pages_controller.rb index e23a961a..5f383316 100644 --- a/app/controllers/site_wiki_pages_controller.rb +++ b/app/controllers/site_wiki_pages_controller.rb @@ -1,6 +1,6 @@ # encoding: utf-8 #-- -# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) +# Copyright (C) 2012 Gitorious AS # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/app/helpers/site_wiki_pages_helper.rb b/app/helpers/site_wiki_pages_helper.rb index 51b04f33..4d943f8f 100644 --- a/app/helpers/site_wiki_pages_helper.rb +++ b/app/helpers/site_wiki_pages_helper.rb @@ -1,7 +1,6 @@ # encoding: utf-8 #-- -# Copyright (C) 2009 Johan Sørensen -# Copyright (C) 2009 Tor Arne Vestbø +# Copyright (C) 2012 Gitorious AS # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/app/models/site.rb b/app/models/site.rb index 9aed66db..aacef9a3 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -25,7 +25,7 @@ class Site < ActiveRecord::Base attr_protected :subdomain def self.default - default_site = Site.new(:title => GitoriousConfig["site_name"], :subdomain => nil) + Site.new(:title => GitoriousConfig["site_name"], :subdomain => nil) end def wiki_git_path @@ -33,8 +33,8 @@ def wiki_git_path Repository.full_path_from_partial_path(repo_name) end - def self.wiki_git_path(title) - repo_name = Site.wiki_repo_name(title) + def self.wiki_git_path(site_title) + repo_name = Site.wiki_repo_name(site_title) Repository.full_path_from_partial_path(repo_name) end diff --git a/test/functional/site_wiki_pages_controller_test.rb b/test/functional/site_wiki_pages_controller_test.rb index cc62ed71..1b55e30c 100644 --- a/test/functional/site_wiki_pages_controller_test.rb +++ b/test/functional/site_wiki_pages_controller_test.rb @@ -1,6 +1,6 @@ # encoding: utf-8 #-- -# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) +# Copyright (C) 2012 Gitorious AS # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/test/unit/helpers/site_wiki_pages_helper_test.rb b/test/unit/helpers/site_wiki_pages_helper_test.rb index b0ad1cd9..93003421 100644 --- a/test/unit/helpers/site_wiki_pages_helper_test.rb +++ b/test/unit/helpers/site_wiki_pages_helper_test.rb @@ -1,6 +1,6 @@ # encoding: utf-8 #-- -# Copyright (C) 2009 Johan Sørensen +# Copyright (C) 2012 Gitorious AS # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by