Merge branch '5.x' into remove_livepreview

lib/gollum/app.rb

@@ -390,7 +390,7 @@ module Precious
       @page     = wiki_page(params[:splat].first).page
       @page_num = [params[:page].to_i, 1].max
       unless @page.nil?
-        @versions = @page.versions :page => @page_num
+        @versions = @page.versions(:page => @page_num, :follow => settings.wiki_options.fetch(:follow_renames, git_adapter == 'rjgit' ? false : true))
         mustache :history
       else
         redirect to("/")

lib/gollum/helpers.rb

@@ -6,6 +6,10 @@ module Precious
 
     EMOJI_PATHNAME = Pathname.new(Gemojione.images_path).freeze
 
+    def git_adapter
+      defined?(Gollum::GIT_ADAPTER) ? Gollum::GIT_ADAPTER : DEFAULT_ADAPTER.match(/(.*)_adapter/)[1]
+    end
+
     def join_page_name(name, ext)
       "#{name}#{ext}"
     end

lib/gollum/views/has_page.rb

@@ -11,5 +11,9 @@ module Precious
     def format
       @page.format.to_s
     end
+
+    def id
+      @page.sha
+    end
   end
 end

lib/gollum/views/latest_changes.rb

@@ -23,7 +23,6 @@ module Precious
             :date_full => v.authored_date,
             :files     => v.stats.files.map { |f,*rest|
               page_path = extract_renamed_path_destination(f)
-              page_path = remove_page_extentions(page_path)
               { :file => f,
                 :link => "#{page_path}/#{v.id}"
               }
@@ -32,13 +31,6 @@ module Precious
         end
       end
 
-      def remove_page_extentions(page_path)
-        Gollum::Markup.formats.values.each do |format|
-          page_path = page_path.gsub(/\.#{format[:regexp]}$/, '')
-        end
-        return page_path
-      end
-
       def extract_renamed_path_destination(file)
         return file.gsub(/{.* => (.*)}/, '\1').gsub(/.* => (.*)/, '\1')
       end