Merge branch 'refactoring/user_model' of /home/git/repositories/gitlab/gitlab-ci

Author: dzaporozhets

app/controllers/projects_controller.rb

@@ -19,7 +19,6 @@ def show
 
     @ref = params[:ref]
 
-
     @builds = @project.builds
     @builds = @builds.where(ref: @ref) if @ref
     @builds = @builds.order('id DESC').page(params[:page]).per(20)
@@ -110,13 +109,9 @@ def charts
   end
 
   def gitlab
+    @page = (params[:page] || 1).to_i
     @per_page = 100
-    @page = if params[:page].present?
-              params[:page].to_i
-            else
-              1
-            end
-    @projects = Project.from_gitlab(current_user, @page, @per_page)
+    @projects = current_user.gitlab_projects(@page, @per_page)
   rescue
     @error = 'Failed to fetch GitLab projects'
   end

app/models/user.rb

@@ -1,5 +1,20 @@
+# User object is stored in session
 class User
+  attr_reader :attributes
+
   def initialize(hash)
+    @attributes = hash
+  end
+
+  def gitlab_projects(page = 1, per_page = 100)
+    Project.from_gitlab(self, page, per_page, :authorized)
+  end
 
+  def method_missing(meth, *args, &block)
+    if attributes.has_key?(meth.to_s)
+      attributes[meth.to_s]
+    else
+      super
+    end
   end
 end

app/models/user_session.rb

@@ -13,8 +13,7 @@ def authenticate auth_opts
     user = Network.new.authenticate(url, auth_opts)
 
     if user
-      user[:url] = url
-      OpenStruct.new(user)
+      User.new(user.merge("url" => url))
     else
       nil
     end

config/application.yml.example

@@ -3,8 +3,7 @@ defaults: &defaults
     - 'https://dev.gitlab.org/'
     - 'https://staging.gitlab.org/'
   gitlab_ci:
-    https:
-      enabled: false
+    https: false
   gravatar:
     enabled: true
     plain_url: "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"

config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-GitlabCi::Application.config.secret_token = '78140d64a8cee2937e883d9ff91a5a554c01e30c0e0042b470cd574d19462da8a607abdc23fa501c4580c74655742990a1da88ef03485c3cf9ac370f12e9397a'
+GitlabCi::Application.config.secret_token = '41cff934d5a788409310b2b4dc931ca9be9c5113ede94f41d44bf71b403f007d8031efa855d6d111393d33ca839722db98445a1a6f020331a3f43bd29a50c93e'