Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable

Dmitriy Zaporozhets
2 parents 36dc6e6b 671cdc5c
Showing 3 changed files with 4 additions and 3 deletions Show diff stats
VERSION
lib/api/helpers.rb
lib/tasks/gitlab/check.rake
-5.4.1
+5.4.2
 module API
   module APIHelpers
     def current_user
-      @current_user ||= User.find_by_authentication_token(params[:private_token] || env["HTTP_PRIVATE_TOKEN"])
+      private_token = (params[:private_token] || env["HTTP_PRIVATE_TOKEN"]).to_s
+      @current_user ||= User.find_by_authentication_token(private_token)
     end
  
     def user_project
@@ -657,7 +657,7 @@ namespace :gitlab do
   end
  
   def check_gitlab_shell
-    required_version = Gitlab::VersionInfo.new(1, 7, 4)
+    required_version = Gitlab::VersionInfo.new(1, 7, 8)
     current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
  
     print "GitLab Shell version >= #{required_version} ? ... "
1	1	module API
2	2	module APIHelpers
3	3	def current_user
4		- @current_user \|\|= User.find_by_authentication_token(params[:private_token] \|\| env["HTTP_PRIVATE_TOKEN"])
	4	+ private_token = (params[:private_token] \|\| env["HTTP_PRIVATE_TOKEN"]).to_s
	5	+ @current_user \|\|= User.find_by_authentication_token(private_token)
5	6	end
6	7
7	8	def user_project
...	...
...	...	@@ -657,7 +657,7 @@ namespace :gitlab do
657	657	end
658	658
659	659	def check_gitlab_shell
660		- required_version = Gitlab::VersionInfo.new(1, 7, 4)
	660	+ required_version = Gitlab::VersionInfo.new(1, 7, 8)
661	661	current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
662	662
663	663	print "GitLab Shell version >= #{required_version} ? ... "
...	...