Merge branch 'release/2.4.4'

7 files changed, 18 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index 50e2fb7..7aef161 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem "rdiscount", "1.3.1.1", :platforms => :ruby
 gem "mime-types", "1.16", :require => "mime/types"
 gem "diff-lcs", "1.1.2", :require => "diff/lcs"
 gem "oauth", "0.4.4"
-gem "paperclip", "~> 2.4.5"
+gem "paperclip", "~> 2.7.2"
 gem "state_machine", "0.9.4"
 
 gem "builder", "3.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 390d2de..f74be46 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     chronic (0.3.0)
-    cocaine (0.4.2)
+    cocaine (0.3.2)
     daemons (1.1.0)
     diff-lcs (1.1.2)
     echoe (4.3.1)
@@ -83,10 +83,10 @@ GEM
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
     oauth (0.4.4)
-    paperclip (2.4.5)
+    paperclip (2.7.4)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+      cocaine (~> 0.3.0)
       mime-types
     proxymachine (1.2.4)
       eventmachine (>= 0.12.10)
@@ -190,7 +190,7 @@ DEPENDENCIES
   net-ldap (~> 0.3)
   nokogiri (= 1.5.0)
   oauth (= 0.4.4)
-  paperclip (~> 2.4.5)
+  paperclip (~> 2.7.2)
   proxymachine (= 1.2.4)
   rails (= 2.3.14)
   rake (= 0.8.7)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 367550f..b968284 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -105,10 +105,9 @@ module ApplicationHelper
   def default_css_tag_sizes
     %w(tag_size_1 tag_size_2 tag_size_3 tag_size_4)
   end
-
   def linked_tag_list_as_sentence(tags)
     tags.map do |tag|
-      link_to(h(tag.name), search_path(:q => "category:#{h(tag.name)}"))
+      link_to(h(tag.name), search_path(:q => "@category #{h(tag.name)}"))
     end.to_sentence
   end
 
diff --git a/app/helpers/searches_helper.rb b/app/helpers/searches_helper.rb
index d7b4f59..48e9af3 100644
--- a/app/helpers/searches_helper.rb
+++ b/app/helpers/searches_helper.rb
@@ -56,7 +56,7 @@ module SearchesHelper
 
     def tag_list
       @project.tag_list.map do |tag|
-        link_to(h(tag), "/search?q=#{h(tag)}")
+        link_to(h(tag), "/search?q=%40category+#{h(tag)}")
       end.to_sentence
     end
 
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 0aa9818..d2b4280 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -48,12 +48,12 @@
     <%= f.label :url, t("views.users.openid") -%>
     <div><%= f.text_field :identity_url -%></div>
   </li>
-  
+
   <li>
     <%= f.label :avatar, t('views.users.avatar') %>
   	<div><%= avatar(@user, :version => :thumb, :size => '24') %>
     <%- if @user.avatar? -%>
-      <%= button_to_function("Delete current profile image", "if (confirm('Are you sure you want to delete your profile image?')) $('#delete_avatar').submit()") %> 
+      <%= button_to_function("Delete current profile image", "if (confirm('Are you sure you want to delete your profile image?')) $('#delete_avatar').submit()") %>
     <%- end -%>
 	<span class="hint"> If you do not add an image, Gitorious will try to use your gravatar </span>
 	</div>
@@ -63,14 +63,14 @@
 		<label>Upload avatar</label>
 		<div><%= f.file_field :avatar %></div>
 	</li>
-	
+
 	<li>
     	<%= f.label :wants_email_notifications, t("views.users.wants_email_notifications") %>
     	<div><%= f.check_box :wants_email_notifications %><span class="hint"> <%= t("views.users.describe_email_notifications") -%></span></div>
 	</li>
   <li>
     <%= f.label :default_favorite_notifications -%>
-    <div><%= f.check_box :default_favorite_notifications -%><span class="hint"> <%= t("views.users.describe_default_favorite_notifications", :url => favorites_path) -%></span></div>
+    <div><%= f.check_box :default_favorite_notifications -%><span class="hint"> <%= t("views.users.default_favorite_notifications", :url => favorites_path) -%></span></div>
   </li>
   </fieldset>
 <fieldset class="submit">
@@ -79,5 +79,5 @@
 <% end -%>
 
 <%- form_for(@user, :url => avatar_user_path, :html => {:id => "delete_avatar", :method => :delete}) do |f| -%>
-  
+
 <%- end -%>
diff --git a/config/gitorious.sample.yml b/config/gitorious.sample.yml
index fa1747d..312bc30 100644
--- a/config/gitorious.sample.yml
+++ b/config/gitorious.sample.yml
@@ -110,7 +110,7 @@ production:
   # directories instead. This helps avoid hitting
   # (filesystem-specific) limits on number of entries in a directory.
   # enable_repository_dir_sharding: true
-  
+
   # Base directory for mirror ie symlinks to actual repositories
   # Designate a folder where symlinks to all current repository
   # directories are created. Handy for hosting Gitweb, cgit etc in
@@ -153,7 +153,7 @@ production:
   # from the following URIs mapping to the file system:
   # - /tarballs/<tarball-name>   -> <archive_cache_dir>/<tarball-name>
   # - /
-  # 
+  #
   # Furthermore, you should instruct Nginx to consider these URLs private to prevent direct
   # access to them. Have a look in doc/templates/nginx.conf.sample for an example
   #frontend_server: nginx
@@ -183,7 +183,7 @@ production:
 
   # Make all newly created projects and repos private from the start by default
   #repos_and_projects_private_by_default: false
-  
+
   # Only site admins can create projects.  If a regular user attempts
   # to create a project (s)he is redirected to a form where a project
   # proposal (name+description) can be submitted. Site admins are
@@ -371,8 +371,8 @@ production:
   # enter a label to display next to the username field in Gitorious
   # custom_username_label: Username
 
-  # Should LDAP be used for authorization? 
-  # use_ldap_for_authorization: true
+  # Should LDAP be used for authorization?
+  # use_ldap_authorization: true
 
 development:
 
diff --git a/lib/gitorious.rb b/lib/gitorious.rb
index 73f8641..bcacdf3 100644
--- a/lib/gitorious.rb
+++ b/lib/gitorious.rb
@@ -16,5 +16,5 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 module Gitorious
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end