Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/views/projects/snippets/_blob.html.haml

@@ -6,9 +6,5 @@
       .btn-group.tree-btn-group.pull-right
         - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
           = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet'
-        = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
-  .file-content.code
-    - unless @snippet.content.empty?
-      = render 'shared/file_hljs', blob: @snippet
-    - else
-      %p.nothing_here_message Empty file
+        = link_to "Raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
+  = render 'snippets/blob_content'

app/views/snippets/_blob.html.haml

@@ -8,17 +8,4 @@
           = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet'
           = link_to "Delete", snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-tiny", title: 'Delete Snippet'
         = link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank"
-  - unless @snippet.content.empty?
-    - if gitlab_markdown?(@snippet.file_name)
-      .file-content.wiki
-        = preserve do
-          = markdown(@snippet.data)
-    - elsif markup?(@snippet.file_name)
-      .file-content.wiki
-        = render_markup(@snippet.file_name, @snippet.data)
-    - else
-      .file-content.code
-        = render 'shared/file_hljs', blob: @snippet
-  - else
-    .file-content.code
-      %p.nothing_here_message Empty file
+  = render 'snippets/blob_content'

app/views/snippets/_blob_content.html.haml

+- unless @snippet.content.empty?
+  - if gitlab_markdown?(@snippet.file_name)
+    .file-content.wiki
+      = preserve do
+        = markdown(@snippet.data)
+  - elsif markup?(@snippet.file_name)
+    .file-content.wiki
+      = render_markup(@snippet.file_name, @snippet.data)
+  - else
+    .file-content.code
+      = render 'shared/file_hljs', blob: @snippet
+- else
+  .file-content.code
+    %p.nothing_here_message Empty file

doc/development/architecture.md

@@ -30,7 +30,7 @@ To summarize here's the [directory structure of the `git` user home directory](.
 
     ps aux | grep '^git'
 
-GitLab has several components to operate. As a system user (i.e. any user that is not the `git` user) it requires a persistent database (MySQL/PostreSQL) and redis database. It also uses Apache httpd or nginx to proxypass Unicorn. As the `git` user it starts Sidekiq and Unicorn (a simple ruby HTTP server running on port `8080` by default). Under the gitlab user there are normally 6 processes: `unicorn_rails master` (1 process), `unicorn_rails worker` (2 processes), `python pygments` (2 processes), `sidekiq` (1 process).  Pygments is used by GitLab for syntax highlighting in the web interface.
+GitLab has several components to operate. As a system user (i.e. any user that is not the `git` user) it requires a persistent database (MySQL/PostreSQL) and redis database. It also uses Apache httpd or nginx to proxypass Unicorn. As the `git` user it starts Sidekiq and Unicorn (a simple ruby HTTP server running on port `8080` by default). Under the gitlab user there are normally 4 processes: `unicorn_rails master` (1 process), `unicorn_rails worker` (2 processes), `sidekiq` (1 process).
 
 ## Repository access
 

lib/tasks/gitlab/check.rake

@@ -312,52 +312,6 @@ namespace :gitlab do
         fix_and_rerun
       end
     end
-
-    def check_python2_exists
-      print "Has python2? ... "
-
-      # Python prints its version to STDERR
-      # so we can't just use run("python2 --version")
-      if run_and_match("which python2", /python2$/)
-        puts "yes".green
-      else
-        puts "no".red
-        try_fixing_it(
-          "Make sure you have Python 2.5+ installed",
-          "Link it to python2"
-        )
-        for_more_information(
-          see_installation_guide_section "Packages / Dependencies"
-        )
-        fix_and_rerun
-      end
-    end
-
-    def check_python2_version
-      print "python2 is supported version? ... "
-
-      # Python prints its version to STDERR
-      # so we can't just use run("python2 --version")
-
-      unless run_and_match("which python2", /python2$/)
-        puts "can't check because of previous errors".magenta
-        return
-      end
-
-      if `python2 --version 2>&1` =~ /2\.[567]\.\d/
-        puts "yes".green
-      else
-        puts "no".red
-        try_fixing_it(
-          "Make sure you have Python 2.5+ installed",
-          "Link it to python2"
-        )
-        for_more_information(
-          see_installation_guide_section "Packages / Dependencies"
-        )
-        fix_and_rerun
-      end
-    end
   end