Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

2015-10-28 14:59:03 +08:00 · 2015-10-28 14:59:03 +08:00 · c8d9ce81bf
parent 61dc979ee4 5bcc9c21f2
commit c8d9ce81bf
1 changed files with 6 additions and 2 deletions
--- a/lib/trustie/gitlab/manage_member.rb
+++ b/lib/trustie/gitlab/manage_member.rb
@ -42,12 +42,16 @@ module Trustie
      end

      def repository
+        unless project.nil?
          project.repository
        end
+      end

      def isGitlabProject?
+        unless repository.nil?
          repository && repository.gitlab?
        end
+      end

    end