Merge branch 'master' into fixes/api

lib/api/internal.rb

@@ -5,6 +5,12 @@ module Gitlab
       #
       # Check if ssh key has access to project code
       #
+      # Params:
+      #   key_id - SSH Key id
+      #   project - project path with namespace
+      #   action - git action (git-upload-pack or git-receive-pack)
+      #   ref - branch name
+      #
       get "/allowed" do
         key = Key.find(params[:key_id])
         project = Project.find_with_namespace(params[:project])

lib/tasks/gitlab/check.rake

@@ -255,7 +255,6 @@ namespace :gitlab do
       warn_user_is_not_gitlab
       start_checking "Environment"
 
-      check_issue_1059_shell_profile_error
       check_gitlab_git_config
       check_python2_exists
       check_python2_version
@@ -294,30 +293,6 @@ namespace :gitlab do
       end
     end
 
-    # see https://github.com/gitlabhq/gitlabhq/issues/1059
-    def check_issue_1059_shell_profile_error
-      gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
-      print "Has no \"-e\" in ~#{gitlab_shell_ssh_user}/.profile ... "
-
-      profile_file = File.join(gitlab_shell_user_home, ".profile")
-
-      unless File.read(profile_file) =~ /^-e PATH/
-        puts "yes".green
-      else
-        puts "no".red
-        try_fixing_it(
-          "Open #{profile_file}",
-          "Find the line starting with \"-e PATH\"",
-          "Remove \"-e \" so the line starts with PATH"
-        )
-        for_more_information(
-          see_installation_guide_section("Gitlab Shell"),
-          "https://github.com/gitlabhq/gitlabhq/issues/1059"
-        )
-        fix_and_rerun
-      end
-    end
-
     def check_python2_exists
       print "Has python2? ... "