From 0ac65b6cc31962c293782a1f3e8d6d41922569c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 20 Jan 2017 18:13:14 +0100
Subject: Don't override presentee methods for
 Gitlab::View::Presenter::Delegated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/gitlab/view/presenter/delegated.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/view/presenter/delegated.rb b/lib/gitlab/view/presenter/delegated.rb
index f4d330c590e..fd90f7c2bad 100644
--- a/lib/gitlab/view/presenter/delegated.rb
+++ b/lib/gitlab/view/presenter/delegated.rb
@@ -8,7 +8,9 @@ module Gitlab
           @subject = subject
 
           attributes.each do |key, value|
-            define_singleton_method(key) { value }
+            unless subject.respond_to?(key)
+              define_singleton_method(key) { value }
+            end
           end
 
           super(subject)
-- 
cgit v1.2.1


From 6a3d29c73d2578c7b2a40f2dfcb823b681a70f7e Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Mon, 14 Nov 2016 01:56:39 -0200
Subject: Add ability to define a coverage regex in the .gitlab-ci.yml

* Instead of using the proposed `coverage` key, this expects `coverage_regex`
---
 lib/ci/gitlab_ci_yaml_processor.rb                 |  1 +
 lib/gitlab/ci/config/entry/job.rb                  |  8 +++++--
 .../ci/config/entry/legacy_validation_helpers.rb   | 10 ++++++---
 lib/gitlab/ci/config/entry/validators.rb           | 10 +++++++++
 lib/gitlab/ci/config/node/regexp.rb                | 26 ++++++++++++++++++++++
 5 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 lib/gitlab/ci/config/node/regexp.rb

(limited to 'lib')

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 7463bd719d5..2f5ef4d36bd 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -61,6 +61,7 @@ module Ci
         allow_failure: job[:allow_failure] || false,
         when: job[:when] || 'on_success',
         environment: job[:environment_name],
+        coverage_regex: job[:coverage_regex],
         yaml_variables: yaml_variables(name),
         options: {
           image: job[:image],
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index a55362f0b6b..3c7ef99cefc 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -11,7 +11,7 @@ module Gitlab
 
           ALLOWED_KEYS = %i[tags script only except type image services allow_failure
                             type stage when artifacts cache dependencies before_script
-                            after_script variables environment]
+                            after_script variables environment coverage_regex]
 
           validations do
             validates :config, allowed_keys: ALLOWED_KEYS
@@ -71,9 +71,12 @@ module Gitlab
           entry :environment, Entry::Environment,
                description: 'Environment configuration for this job.'
 
+          node :coverage_regex, Node::Regexp,
+               description: 'Coverage scanning regex configuration for this job.'
+
           helpers :before_script, :script, :stage, :type, :after_script,
                   :cache, :image, :services, :only, :except, :variables,
-                  :artifacts, :commands, :environment
+                  :artifacts, :commands, :environment, :coverage_regex
 
           attributes :script, :tags, :allow_failure, :when, :dependencies
 
@@ -130,6 +133,7 @@ module Gitlab
               variables: variables_defined? ? variables_value : nil,
               environment: environment_defined? ? environment_value : nil,
               environment_name: environment_defined? ? environment_value[:name] : nil,
+              coverage_regex: coverage_regex_defined? ? coverage_regex_value : nil,
               artifacts: artifacts_value,
               after_script: after_script_value }
           end
diff --git a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
index f01975aab5c..34e7052befc 100644
--- a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
+++ b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
@@ -28,17 +28,21 @@ module Gitlab
             value.is_a?(String) || value.is_a?(Symbol)
           end
 
+          def validate_regexp(value)
+            !!::Regexp.new(value)
+          rescue RegexpError
+            false
+          end
+
           def validate_string_or_regexp(value)
             return true if value.is_a?(Symbol)
             return false unless value.is_a?(String)
 
             if value.first == '/' && value.last == '/'
-              Regexp.new(value[1...-1])
+              validate_regexp(value[1...-1])
             else
               true
             end
-          rescue RegexpError
-            false
           end
 
           def validate_boolean(value)
diff --git a/lib/gitlab/ci/config/entry/validators.rb b/lib/gitlab/ci/config/entry/validators.rb
index 8632dd0e233..03a8205b081 100644
--- a/lib/gitlab/ci/config/entry/validators.rb
+++ b/lib/gitlab/ci/config/entry/validators.rb
@@ -54,6 +54,16 @@ module Gitlab
             end
           end
 
+          class RegexpValidator < ActiveModel::EachValidator
+            include LegacyValidationHelpers
+
+            def validate_each(record, attribute, value)
+              unless validate_regexp(value)
+                record.errors.add(attribute, 'must be a regular expression')
+              end
+            end
+          end
+
           class TypeValidator < ActiveModel::EachValidator
             def validate_each(record, attribute, value)
               type = options[:with]
diff --git a/lib/gitlab/ci/config/node/regexp.rb b/lib/gitlab/ci/config/node/regexp.rb
new file mode 100644
index 00000000000..7c5843eb8b6
--- /dev/null
+++ b/lib/gitlab/ci/config/node/regexp.rb
@@ -0,0 +1,26 @@
+module Gitlab
+  module Ci
+    class Config
+      module Node
+        ##
+        # Entry that represents a Regular Expression.
+        #
+        class Regexp < Entry
+          include Validatable
+
+          validations do
+            validates :config, regexp: true
+          end
+
+          def value
+            if @config.first == '/' && @config.last == '/'
+              @config[1...-1]
+            else
+              @config
+            end
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 646b9c54d043edf17924e82d8e80a56e18d14ce4 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Fri, 18 Nov 2016 01:42:35 -0200
Subject: Comply to requests made in the review and adjust to the Entry/Node
 changes

This commit:
* Turns `coverage_regex` into `coverage` entry in yml file
* Fixes smaller requests from code reviewers for the previous commit
* This commit is temporary (will be squashed afterwards)

This commit does not (further commits will do though):
* Add global `coverage` entry handling in yml file as suggested by Grzegorz
* Add specs
* Create changelog
* Create docs
---
 lib/ci/gitlab_ci_yaml_processor.rb                 |  2 +-
 lib/gitlab/ci/config/entry/coverage.rb             | 26 ++++++++++++++++++++++
 lib/gitlab/ci/config/entry/job.rb                  |  8 +++----
 .../ci/config/entry/legacy_validation_helpers.rb   |  3 ++-
 lib/gitlab/ci/config/node/regexp.rb                | 26 ----------------------
 5 files changed, 33 insertions(+), 32 deletions(-)
 create mode 100644 lib/gitlab/ci/config/entry/coverage.rb
 delete mode 100644 lib/gitlab/ci/config/node/regexp.rb

(limited to 'lib')

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 2f5ef4d36bd..649ee4d018b 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -61,7 +61,7 @@ module Ci
         allow_failure: job[:allow_failure] || false,
         when: job[:when] || 'on_success',
         environment: job[:environment_name],
-        coverage_regex: job[:coverage_regex],
+        coverage_regex: job[:coverage],
         yaml_variables: yaml_variables(name),
         options: {
           image: job[:image],
diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
new file mode 100644
index 00000000000..88fc03db2d9
--- /dev/null
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -0,0 +1,26 @@
+module Gitlab
+  module Ci
+    class Config
+      module Entry
+        ##
+        # Entry that represents a Regular Expression.
+        #
+        class Coverage < Node
+          include Validatable
+
+          validations do
+            validates :config, regexp: true
+          end
+
+          def value
+            if @config.first == '/' && @config.last == '/'
+              @config[1...-1]
+            else
+              @config
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 3c7ef99cefc..bde6663344a 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -11,7 +11,7 @@ module Gitlab
 
           ALLOWED_KEYS = %i[tags script only except type image services allow_failure
                             type stage when artifacts cache dependencies before_script
-                            after_script variables environment coverage_regex]
+                            after_script variables environment coverage]
 
           validations do
             validates :config, allowed_keys: ALLOWED_KEYS
@@ -71,12 +71,12 @@ module Gitlab
           entry :environment, Entry::Environment,
                description: 'Environment configuration for this job.'
 
-          node :coverage_regex, Node::Regexp,
+          entry :coverage, Entry::Coverage,
                description: 'Coverage scanning regex configuration for this job.'
 
           helpers :before_script, :script, :stage, :type, :after_script,
                   :cache, :image, :services, :only, :except, :variables,
-                  :artifacts, :commands, :environment, :coverage_regex
+                  :artifacts, :commands, :environment, :coverage
 
           attributes :script, :tags, :allow_failure, :when, :dependencies
 
@@ -133,7 +133,7 @@ module Gitlab
               variables: variables_defined? ? variables_value : nil,
               environment: environment_defined? ? environment_value : nil,
               environment_name: environment_defined? ? environment_value[:name] : nil,
-              coverage_regex: coverage_regex_defined? ? coverage_regex_value : nil,
+              coverage: coverage_defined? ? coverage_value : nil,
               artifacts: artifacts_value,
               after_script: after_script_value }
           end
diff --git a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
index 34e7052befc..98db4632dad 100644
--- a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
+++ b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
@@ -29,7 +29,8 @@ module Gitlab
           end
 
           def validate_regexp(value)
-            !!::Regexp.new(value)
+            Regexp.new(value)
+            true
           rescue RegexpError
             false
           end
diff --git a/lib/gitlab/ci/config/node/regexp.rb b/lib/gitlab/ci/config/node/regexp.rb
deleted file mode 100644
index 7c5843eb8b6..00000000000
--- a/lib/gitlab/ci/config/node/regexp.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module Gitlab
-  module Ci
-    class Config
-      module Node
-        ##
-        # Entry that represents a Regular Expression.
-        #
-        class Regexp < Entry
-          include Validatable
-
-          validations do
-            validates :config, regexp: true
-          end
-
-          def value
-            if @config.first == '/' && @config.last == '/'
-              @config[1...-1]
-            else
-              @config
-            end
-          end
-        end
-      end
-    end
-  end
-end
-- 
cgit v1.2.1


From d0afc500e30ad0fe334d6dc16dd1766d8f6c523a Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Sat, 19 Nov 2016 22:48:02 -0200
Subject: Change expected `coverage` structure for CI configuration YAML file

Instead of using:
`coverage: /\(\d+.\d+%\) covered/`

This structure must be used now:
```
coverage:
  output_filter: /\(\d+.\d+%\) covered/`
```

The surrounding '/' is optional.
---
 lib/ci/gitlab_ci_yaml_processor.rb                   |  2 +-
 lib/gitlab/ci/config/entry/coverage.rb               | 20 +++++++++++++++-----
 lib/gitlab/ci/config/entry/job.rb                    |  2 +-
 .../ci/config/entry/legacy_validation_helpers.rb     |  4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 649ee4d018b..02944e0385a 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -61,7 +61,7 @@ module Ci
         allow_failure: job[:allow_failure] || false,
         when: job[:when] || 'on_success',
         environment: job[:environment_name],
-        coverage_regex: job[:coverage],
+        coverage_regex: job[:coverage][:output_filter],
         yaml_variables: yaml_variables(name),
         options: {
           image: job[:image],
diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index 88fc03db2d9..e5da3cf23fd 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -8,17 +8,27 @@ module Gitlab
         class Coverage < Node
           include Validatable
 
+          ALLOWED_KEYS = %i[output_filter]
+
           validations do
-            validates :config, regexp: true
+            validates :config, type: Hash
+            validates :config, allowed_keys: ALLOWED_KEYS
+            validates :output_filter, regexp: true
           end
 
-          def value
-            if @config.first == '/' && @config.last == '/'
-              @config[1...-1]
+          def output_filter
+            output_filter_value = @config[:output_filter].to_s
+
+            if output_filter_value.start_with?('/') && output_filter_value.end_with?('/')
+              output_filter_value[1...-1]
             else
-              @config
+              value[:output_filter]
             end
           end
+
+          def value
+            @config.merge(output_filter: output_filter)
+          end
         end
       end
     end
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index bde6663344a..69a5e6f433d 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -72,7 +72,7 @@ module Gitlab
                description: 'Environment configuration for this job.'
 
           entry :coverage, Entry::Coverage,
-               description: 'Coverage scanning regex configuration for this job.'
+               description: 'Coverage configuration for this job.'
 
           helpers :before_script, :script, :stage, :type, :after_script,
                   :cache, :image, :services, :only, :except, :variables,
diff --git a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
index 98db4632dad..d8e74b15712 100644
--- a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
+++ b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
@@ -31,7 +31,7 @@ module Gitlab
           def validate_regexp(value)
             Regexp.new(value)
             true
-          rescue RegexpError
+          rescue RegexpError, TypeError
             false
           end
 
@@ -39,7 +39,7 @@ module Gitlab
             return true if value.is_a?(Symbol)
             return false unless value.is_a?(String)
 
-            if value.first == '/' && value.last == '/'
+            if value.start_with?('/') && value.end_with?('/')
               validate_regexp(value[1...-1])
             else
               true
-- 
cgit v1.2.1


From 9f97cc6515ac1254c443673c84700942690bbc15 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Sun, 20 Nov 2016 00:05:49 -0200
Subject: Add `coverage` to the Global config entry as well

---
 lib/gitlab/ci/config/entry/global.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/global.rb b/lib/gitlab/ci/config/entry/global.rb
index a4ec8f0ff2f..ede97cc0504 100644
--- a/lib/gitlab/ci/config/entry/global.rb
+++ b/lib/gitlab/ci/config/entry/global.rb
@@ -33,8 +33,11 @@ module Gitlab
           entry :cache, Entry::Cache,
             description: 'Configure caching between build jobs.'
 
+          entry :coverage, Entry::Coverage,
+               description: 'Coverage configuration for this pipeline.'
+
           helpers :before_script, :image, :services, :after_script,
-                  :variables, :stages, :types, :cache, :jobs
+                  :variables, :stages, :types, :cache, :coverage, :jobs
 
           def compose!(_deps = nil)
             super(self) do
-- 
cgit v1.2.1


From 0713a7c3a9eb1bcfdf6adde0c3365549c19a3ee1 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Mon, 21 Nov 2016 02:38:03 -0200
Subject: Add specs to cover the implemented feature and fix a small bug

---
 lib/gitlab/ci/config/entry/coverage.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index e5da3cf23fd..af12837130c 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -22,7 +22,7 @@ module Gitlab
             if output_filter_value.start_with?('/') && output_filter_value.end_with?('/')
               output_filter_value[1...-1]
             else
-              value[:output_filter]
+              @config[:output_filter]
             end
           end
 
-- 
cgit v1.2.1


From bb12ee051f95ee747c0e2b98a85675de53dca8ea Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Mon, 21 Nov 2016 02:51:29 -0200
Subject: Fix wrong description for Coverage entry (in ruby comments)

---
 lib/gitlab/ci/config/entry/coverage.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index af12837130c..41e1d6e0c86 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -3,7 +3,7 @@ module Gitlab
     class Config
       module Entry
         ##
-        # Entry that represents a Regular Expression.
+        # Entry that represents Coverage settings.
         #
         class Coverage < Node
           include Validatable
-- 
cgit v1.2.1


From f1e920ed86133bfea0abfc66ca44282813822073 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Sat, 26 Nov 2016 01:02:08 -0200
Subject: Simplify coverage setting and comply to some requests in code review

---
 lib/ci/gitlab_ci_yaml_processor.rb     |  2 +-
 lib/gitlab/ci/config/entry/coverage.rb | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 02944e0385a..649ee4d018b 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -61,7 +61,7 @@ module Ci
         allow_failure: job[:allow_failure] || false,
         when: job[:when] || 'on_success',
         environment: job[:environment_name],
-        coverage_regex: job[:coverage][:output_filter],
+        coverage_regex: job[:coverage],
         yaml_variables: yaml_variables(name),
         options: {
           image: job[:image],
diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index 41e1d6e0c86..aa738fcfd11 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -8,27 +8,17 @@ module Gitlab
         class Coverage < Node
           include Validatable
 
-          ALLOWED_KEYS = %i[output_filter]
-
           validations do
-            validates :config, type: Hash
-            validates :config, allowed_keys: ALLOWED_KEYS
-            validates :output_filter, regexp: true
+            validates :config, regexp: true
           end
 
-          def output_filter
-            output_filter_value = @config[:output_filter].to_s
-
-            if output_filter_value.start_with?('/') && output_filter_value.end_with?('/')
-              output_filter_value[1...-1]
+          def value
+            if @config.start_with?('/') && @config.end_with?('/')
+              @config[1...-1]
             else
-              @config[:output_filter]
+              @config
             end
           end
-
-          def value
-            @config.merge(output_filter: output_filter)
-          end
         end
       end
     end
-- 
cgit v1.2.1


From 6323cd7203dbf1850e7939e81db4b1a9c6cf6d76 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Mon, 5 Dec 2016 02:00:47 -0200
Subject: Comply to more requirements and requests made in the code review

---
 lib/gitlab/ci/config/entry/coverage.rb                  | 2 +-
 lib/gitlab/ci/config/entry/legacy_validation_helpers.rb | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index aa738fcfd11..706bfc882de 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -13,7 +13,7 @@ module Gitlab
           end
 
           def value
-            if @config.start_with?('/') && @config.end_with?('/')
+            if @config.first == '/' && @config.last == '/'
               @config[1...-1]
             else
               @config
diff --git a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
index d8e74b15712..9b9a0a8125a 100644
--- a/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
+++ b/lib/gitlab/ci/config/entry/legacy_validation_helpers.rb
@@ -29,8 +29,7 @@ module Gitlab
           end
 
           def validate_regexp(value)
-            Regexp.new(value)
-            true
+            !value.nil? && Regexp.new(value.to_s) && true
           rescue RegexpError, TypeError
             false
           end
@@ -39,7 +38,7 @@ module Gitlab
             return true if value.is_a?(Symbol)
             return false unless value.is_a?(String)
 
-            if value.start_with?('/') && value.end_with?('/')
+            if value.first == '/' && value.last == '/'
               validate_regexp(value[1...-1])
             else
               true
-- 
cgit v1.2.1


From be7106a145b1e3d4c6e06503e0f7f3032ace3764 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Wed, 7 Dec 2016 03:01:34 -0200
Subject: Force coverage value to always be surrounded by '/'

---
 lib/gitlab/ci/config/entry/coverage.rb   |  8 -------
 lib/gitlab/ci/config/entry/trigger.rb    | 10 +-------
 lib/gitlab/ci/config/entry/validators.rb | 39 ++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index 706bfc882de..25546f363fb 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -11,14 +11,6 @@ module Gitlab
           validations do
             validates :config, regexp: true
           end
-
-          def value
-            if @config.first == '/' && @config.last == '/'
-              @config[1...-1]
-            else
-              @config
-            end
-          end
         end
       end
     end
diff --git a/lib/gitlab/ci/config/entry/trigger.rb b/lib/gitlab/ci/config/entry/trigger.rb
index 28b0a9ffe01..16b234e6c59 100644
--- a/lib/gitlab/ci/config/entry/trigger.rb
+++ b/lib/gitlab/ci/config/entry/trigger.rb
@@ -9,15 +9,7 @@ module Gitlab
           include Validatable
 
           validations do
-            include LegacyValidationHelpers
-
-            validate :array_of_strings_or_regexps
-
-            def array_of_strings_or_regexps
-              unless validate_array_of_strings_or_regexps(config)
-                errors.add(:config, 'should be an array of strings or regexps')
-              end
-            end
+            validates :config, array_of_strings_or_regexps: true
           end
         end
       end
diff --git a/lib/gitlab/ci/config/entry/validators.rb b/lib/gitlab/ci/config/entry/validators.rb
index 03a8205b081..5f50b80af6c 100644
--- a/lib/gitlab/ci/config/entry/validators.rb
+++ b/lib/gitlab/ci/config/entry/validators.rb
@@ -62,6 +62,45 @@ module Gitlab
                 record.errors.add(attribute, 'must be a regular expression')
               end
             end
+
+            private
+
+            def look_like_regexp?(value)
+              value =~ %r{\A/.*/\z}
+            end
+
+            def validate_regexp(value)
+              look_like_regexp?(value) &&
+                Regexp.new(value.to_s[1...-1]) &&
+                true
+            rescue RegexpError
+              false
+            end
+          end
+
+          class ArrayOfStringsOrRegexps < RegexpValidator
+            def validate_each(record, attribute, value)
+              unless validate_array_of_strings_or_regexps(value)
+                record.errors.add(attribute, 'should be an array of strings or regexps')
+              end
+            end
+
+            private
+
+            def validate_array_of_strings_or_regexps(values)
+              values.is_a?(Array) && values.all?(&method(:validate_string_or_regexp))
+            end
+
+            def validate_string_or_regexp(value)
+              return true if value.is_a?(Symbol)
+              return false unless value.is_a?(String)
+
+              if look_like_regexp?(value)
+                validate_regexp(value)
+              else
+                true
+              end
+            end
           end
 
           class TypeValidator < ActiveModel::EachValidator
-- 
cgit v1.2.1


From 8fe708f4a2850d71c11234b234e039b2a9422299 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Tue, 13 Dec 2016 02:53:12 -0200
Subject: Make more code improvements around the '/' stripping logic

---
 lib/gitlab/ci/config/entry/coverage.rb   |  4 ++++
 lib/gitlab/ci/config/entry/validators.rb | 12 ++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/coverage.rb b/lib/gitlab/ci/config/entry/coverage.rb
index 25546f363fb..12a063059cb 100644
--- a/lib/gitlab/ci/config/entry/coverage.rb
+++ b/lib/gitlab/ci/config/entry/coverage.rb
@@ -11,6 +11,10 @@ module Gitlab
           validations do
             validates :config, regexp: true
           end
+
+          def value
+            @config[1...-1]
+          end
         end
       end
     end
diff --git a/lib/gitlab/ci/config/entry/validators.rb b/lib/gitlab/ci/config/entry/validators.rb
index 5f50b80af6c..30c52dd65e8 100644
--- a/lib/gitlab/ci/config/entry/validators.rb
+++ b/lib/gitlab/ci/config/entry/validators.rb
@@ -66,7 +66,7 @@ module Gitlab
             private
 
             def look_like_regexp?(value)
-              value =~ %r{\A/.*/\z}
+              value.start_with?('/') && value.end_with?('/')
             end
 
             def validate_regexp(value)
@@ -78,7 +78,7 @@ module Gitlab
             end
           end
 
-          class ArrayOfStringsOrRegexps < RegexpValidator
+          class ArrayOfStringsOrRegexpsValidator < RegexpValidator
             def validate_each(record, attribute, value)
               unless validate_array_of_strings_or_regexps(value)
                 record.errors.add(attribute, 'should be an array of strings or regexps')
@@ -94,12 +94,8 @@ module Gitlab
             def validate_string_or_regexp(value)
               return true if value.is_a?(Symbol)
               return false unless value.is_a?(String)
-
-              if look_like_regexp?(value)
-                validate_regexp(value)
-              else
-                true
-              end
+              return validate_regexp(value) if look_like_regexp?(value)
+              true
             end
           end
 
-- 
cgit v1.2.1


From 441a9beec3e6834d3fe5e047e65c4d8b32ff86d5 Mon Sep 17 00:00:00 2001
From: Leandro Camargo <leandroico@gmail.com>
Date: Wed, 18 Jan 2017 01:42:38 -0200
Subject: Make some other refinements to validation logic

---
 lib/gitlab/ci/config/entry/validators.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/config/entry/validators.rb b/lib/gitlab/ci/config/entry/validators.rb
index 30c52dd65e8..bd7428b1272 100644
--- a/lib/gitlab/ci/config/entry/validators.rb
+++ b/lib/gitlab/ci/config/entry/validators.rb
@@ -66,7 +66,8 @@ module Gitlab
             private
 
             def look_like_regexp?(value)
-              value.start_with?('/') && value.end_with?('/')
+              value.is_a?(String) && value.start_with?('/') &&
+                value.end_with?('/')
             end
 
             def validate_regexp(value)
@@ -92,7 +93,6 @@ module Gitlab
             end
 
             def validate_string_or_regexp(value)
-              return true if value.is_a?(Symbol)
               return false unless value.is_a?(String)
               return validate_regexp(value) if look_like_regexp?(value)
               true
-- 
cgit v1.2.1


From 68e94450a06e043ecf58ede565060f41b61043f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 24 Jan 2017 17:07:56 +0100
Subject: Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee
 already respond to method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/gitlab/view/presenter/base.rb      | 2 ++
 lib/gitlab/view/presenter/delegated.rb | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/view/presenter/base.rb b/lib/gitlab/view/presenter/base.rb
index 83c8ba5c1cf..dbfe0941e4d 100644
--- a/lib/gitlab/view/presenter/base.rb
+++ b/lib/gitlab/view/presenter/base.rb
@@ -1,6 +1,8 @@
 module Gitlab
   module View
     module Presenter
+      CannotOverrideMethodError = Class.new(StandardError)
+
       module Base
         extend ActiveSupport::Concern
 
diff --git a/lib/gitlab/view/presenter/delegated.rb b/lib/gitlab/view/presenter/delegated.rb
index fd90f7c2bad..387ff0f5d43 100644
--- a/lib/gitlab/view/presenter/delegated.rb
+++ b/lib/gitlab/view/presenter/delegated.rb
@@ -8,9 +8,11 @@ module Gitlab
           @subject = subject
 
           attributes.each do |key, value|
-            unless subject.respond_to?(key)
-              define_singleton_method(key) { value }
+            if subject.respond_to?(key)
+              raise CannotOverrideMethodError.new("#{subject} already respond to #{key}!")
             end
+
+            define_singleton_method(key) { value }
           end
 
           super(subject)
-- 
cgit v1.2.1


From 066155704dd46b348688366eae176fdcee641f3c Mon Sep 17 00:00:00 2001
From: dimitrieh <dimitriehoekstra@gmail.com>
Date: Wed, 25 Jan 2017 00:13:28 +0100
Subject: added icons and fixed mini pipeline action dropdown icons

---
 lib/gitlab/ci/status/build/cancelable.rb | 2 +-
 lib/gitlab/ci/status/build/play.rb       | 2 +-
 lib/gitlab/ci/status/build/retryable.rb  | 2 +-
 lib/gitlab/ci/status/build/stop.rb       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/status/build/cancelable.rb b/lib/gitlab/ci/status/build/cancelable.rb
index a979fe7d573..f9fa58586f2 100644
--- a/lib/gitlab/ci/status/build/cancelable.rb
+++ b/lib/gitlab/ci/status/build/cancelable.rb
@@ -10,7 +10,7 @@ module Gitlab
           end
 
           def action_icon
-            'ban'
+            'icon_action_cancel_borderless'
           end
 
           def action_path
diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb
index 1bf949c96dd..c5c408f0e3e 100644
--- a/lib/gitlab/ci/status/build/play.rb
+++ b/lib/gitlab/ci/status/build/play.rb
@@ -26,7 +26,7 @@ module Gitlab
           end
 
           def action_icon
-            'play'
+            'icon_action_play_borderless'
           end
 
           def action_title
diff --git a/lib/gitlab/ci/status/build/retryable.rb b/lib/gitlab/ci/status/build/retryable.rb
index 8e38d6a8523..7544df022a4 100644
--- a/lib/gitlab/ci/status/build/retryable.rb
+++ b/lib/gitlab/ci/status/build/retryable.rb
@@ -10,7 +10,7 @@ module Gitlab
           end
 
           def action_icon
-            'refresh'
+            'icon_action_retry_borderless'
           end
 
           def action_title
diff --git a/lib/gitlab/ci/status/build/stop.rb b/lib/gitlab/ci/status/build/stop.rb
index e1dfdb76d41..45d1e80aa35 100644
--- a/lib/gitlab/ci/status/build/stop.rb
+++ b/lib/gitlab/ci/status/build/stop.rb
@@ -14,7 +14,7 @@ module Gitlab
           end
 
           def icon
-            'icon_status_manual'
+            'icon_action_stop_borderless'
           end
 
           def group
-- 
cgit v1.2.1


From 4983fbaaf457cf434bca83ecbc178723d90a3dd2 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 25 Jan 2017 09:40:41 +0000
Subject: Remove unneeded 'borderless' from icons name

---
 lib/gitlab/ci/status/build/cancelable.rb | 2 +-
 lib/gitlab/ci/status/build/play.rb       | 2 +-
 lib/gitlab/ci/status/build/retryable.rb  | 2 +-
 lib/gitlab/ci/status/build/stop.rb       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/status/build/cancelable.rb b/lib/gitlab/ci/status/build/cancelable.rb
index f9fa58586f2..67bbc3c4849 100644
--- a/lib/gitlab/ci/status/build/cancelable.rb
+++ b/lib/gitlab/ci/status/build/cancelable.rb
@@ -10,7 +10,7 @@ module Gitlab
           end
 
           def action_icon
-            'icon_action_cancel_borderless'
+            'icon_action_cancel'
           end
 
           def action_path
diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb
index c5c408f0e3e..b0549b3473c 100644
--- a/lib/gitlab/ci/status/build/play.rb
+++ b/lib/gitlab/ci/status/build/play.rb
@@ -26,7 +26,7 @@ module Gitlab
           end
 
           def action_icon
-            'icon_action_play_borderless'
+            'icon_action_play'
           end
 
           def action_title
diff --git a/lib/gitlab/ci/status/build/retryable.rb b/lib/gitlab/ci/status/build/retryable.rb
index 7544df022a4..6b362af7634 100644
--- a/lib/gitlab/ci/status/build/retryable.rb
+++ b/lib/gitlab/ci/status/build/retryable.rb
@@ -10,7 +10,7 @@ module Gitlab
           end
 
           def action_icon
-            'icon_action_retry_borderless'
+            'icon_action_retry'
           end
 
           def action_title
diff --git a/lib/gitlab/ci/status/build/stop.rb b/lib/gitlab/ci/status/build/stop.rb
index 45d1e80aa35..90401cad0d2 100644
--- a/lib/gitlab/ci/status/build/stop.rb
+++ b/lib/gitlab/ci/status/build/stop.rb
@@ -14,7 +14,7 @@ module Gitlab
           end
 
           def icon
-            'icon_action_stop_borderless'
+            'icon_status_manual'
           end
 
           def group
@@ -26,7 +26,7 @@ module Gitlab
           end
 
           def action_icon
-            'stop'
+            'icon_action_stop'
           end
 
           def action_title
-- 
cgit v1.2.1


From 050103f2093c914b70a61ee23fba86942b5b9cc2 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 26 Jan 2017 18:23:01 +0800
Subject: Make sure TraceReader uses Encoding.default_external

Encoding.default_external was chosen over
Encoding.default_internal because File.read is
returning Encoding.default_external, therefore
we should align with it. Alternatively, we could
force both of them to be Encoding.default_internal.

However, ideally this should be determined by different
projects. For example, some projects might want to use
an encoding different to what GitLab is using.

This might not happen soon though.

Closes #27052
---
 lib/gitlab/ci/trace_reader.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/gitlab/ci/trace_reader.rb b/lib/gitlab/ci/trace_reader.rb
index 37e51536e8f..1d7ddeb3e0f 100644
--- a/lib/gitlab/ci/trace_reader.rb
+++ b/lib/gitlab/ci/trace_reader.rb
@@ -42,6 +42,7 @@ module Gitlab
           end
 
           chunks.join.lines.last(max_lines).join
+            .force_encoding(Encoding.default_external)
         end
       end
     end
-- 
cgit v1.2.1


From 7db05c4da120a394dec3b5175720a9f8751eb736 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 26 Jan 2017 19:55:18 +0000
Subject: Removed unused method

---
 lib/gitlab/ci/status/build/play.rb | 4 ----
 lib/gitlab/ci/status/core.rb       | 3 ---
 2 files changed, 7 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb
index b0549b3473c..0f4b7b24cef 100644
--- a/lib/gitlab/ci/status/build/play.rb
+++ b/lib/gitlab/ci/status/build/play.rb
@@ -33,10 +33,6 @@ module Gitlab
             'Play'
           end
 
-          def action_class
-            'ci-play-icon'
-          end
-
           def action_path
             play_namespace_project_build_path(subject.project.namespace,
                                               subject.project,
diff --git a/lib/gitlab/ci/status/core.rb b/lib/gitlab/ci/status/core.rb
index 73b6ab5a635..3dd2b9e01f6 100644
--- a/lib/gitlab/ci/status/core.rb
+++ b/lib/gitlab/ci/status/core.rb
@@ -42,9 +42,6 @@ module Gitlab
           raise NotImplementedError
         end
 
-        def action_class
-        end
-
         def action_path
           raise NotImplementedError
         end
-- 
cgit v1.2.1


From 6b3f52b46c766e4b6bf085626783a9d2bc34d147 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 27 Jan 2017 14:37:14 +0100
Subject: Fix cycle analytics code after improving serializers

---
 lib/gitlab/cycle_analytics/base_stage.rb            | 2 +-
 lib/gitlab/cycle_analytics/code_event_fetcher.rb    | 2 +-
 lib/gitlab/cycle_analytics/issue_event_fetcher.rb   | 2 +-
 lib/gitlab/cycle_analytics/plan_event_fetcher.rb    | 2 +-
 lib/gitlab/cycle_analytics/review_event_fetcher.rb  | 2 +-
 lib/gitlab/cycle_analytics/stage_summary.rb         | 2 +-
 lib/gitlab/cycle_analytics/staging_event_fetcher.rb | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/cycle_analytics/base_stage.rb b/lib/gitlab/cycle_analytics/base_stage.rb
index 74bbcdcb3dd..559e3939da6 100644
--- a/lib/gitlab/cycle_analytics/base_stage.rb
+++ b/lib/gitlab/cycle_analytics/base_stage.rb
@@ -13,7 +13,7 @@ module Gitlab
       end
 
       def as_json
-        AnalyticsStageSerializer.new.represent(self).as_json
+        AnalyticsStageSerializer.new.represent(self)
       end
 
       def title
diff --git a/lib/gitlab/cycle_analytics/code_event_fetcher.rb b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
index 5245b9ca8fc..d5bf6149749 100644
--- a/lib/gitlab/cycle_analytics/code_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/code_event_fetcher.rb
@@ -18,7 +18,7 @@ module Gitlab
       private
 
       def serialize(event)
-        AnalyticsMergeRequestSerializer.new(project: @project).represent(event).as_json
+        AnalyticsMergeRequestSerializer.new(project: @project).represent(event)
       end
     end
   end
diff --git a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
index 0d8da99455e..3df9cbdcfce 100644
--- a/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/issue_event_fetcher.rb
@@ -16,7 +16,7 @@ module Gitlab
       private
 
       def serialize(event)
-        AnalyticsIssueSerializer.new(project: @project).represent(event).as_json
+        AnalyticsIssueSerializer.new(project: @project).represent(event)
       end
     end
   end
diff --git a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
index 88a8710dbe6..7d342a2d2cb 100644
--- a/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/plan_event_fetcher.rb
@@ -37,7 +37,7 @@ module Gitlab
       def serialize_commit(event, st_commit, query)
         commit = Commit.new(Gitlab::Git::Commit.new(st_commit), @project)
 
-        AnalyticsCommitSerializer.new(project: @project, total_time: event['total_time']).represent(commit).as_json
+        AnalyticsCommitSerializer.new(project: @project, total_time: event['total_time']).represent(commit)
       end
     end
   end
diff --git a/lib/gitlab/cycle_analytics/review_event_fetcher.rb b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
index 4df0bd06393..4c7b3f4467f 100644
--- a/lib/gitlab/cycle_analytics/review_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/review_event_fetcher.rb
@@ -15,7 +15,7 @@ module Gitlab
       end
 
       def serialize(event)
-        AnalyticsMergeRequestSerializer.new(project: @project).represent(event).as_json
+        AnalyticsMergeRequestSerializer.new(project: @project).represent(event)
       end
     end
   end
diff --git a/lib/gitlab/cycle_analytics/stage_summary.rb b/lib/gitlab/cycle_analytics/stage_summary.rb
index b34baf5b081..fc77bd86097 100644
--- a/lib/gitlab/cycle_analytics/stage_summary.rb
+++ b/lib/gitlab/cycle_analytics/stage_summary.rb
@@ -16,7 +16,7 @@ module Gitlab
       private
 
       def serialize(summary_object)
-        AnalyticsSummarySerializer.new.represent(summary_object).as_json
+        AnalyticsSummarySerializer.new.represent(summary_object)
       end
     end
   end
diff --git a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb
index a34731a5fcd..36c0260dbfe 100644
--- a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb
@@ -23,7 +23,7 @@ module Gitlab
       private
 
       def serialize(event)
-        AnalyticsBuildSerializer.new.represent(event['build']).as_json
+        AnalyticsBuildSerializer.new.represent(event['build'])
       end
     end
   end
-- 
cgit v1.2.1


From c446cfcbae82b4bfa2987ddf2b4865b11230ca1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 26 Jan 2017 12:46:02 +0100
Subject: Move ApplicationSetting DEFAULTS to `.defaults` instead
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will avoid autoloading issues in the long term.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/gitlab/current_settings.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 4ebd48a3fc7..e20f5f6f514 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -30,7 +30,7 @@ module Gitlab
     end
 
     def in_memory_application_settings
-      @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting::DEFAULTS)
+      @in_memory_application_settings ||= ::ApplicationSetting.new(::ApplicationSetting.defaults)
     # In case migrations the application_settings table is not created yet,
     # we fallback to a simple OpenStruct
     rescue ActiveRecord::StatementInvalid, ActiveRecord::UnknownAttributeError
@@ -38,7 +38,7 @@ module Gitlab
     end
 
     def fake_application_settings
-      OpenStruct.new(::ApplicationSetting::DEFAULTS)
+      OpenStruct.new(::ApplicationSetting.defaults)
     end
 
     private
-- 
cgit v1.2.1


From f575fe46a792593414f7f21533bfbbdceae2740c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 27 Jan 2017 16:14:58 +0100
Subject: Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/gitlab/backend/shell.rb         | 246 ------------------------------------
 lib/gitlab/backend/shell_adapter.rb |  11 --
 lib/gitlab/shell.rb                 | 246 ++++++++++++++++++++++++++++++++++++
 lib/gitlab/shell_adapter.rb         |  11 ++
 4 files changed, 257 insertions(+), 257 deletions(-)
 delete mode 100644 lib/gitlab/backend/shell.rb
 delete mode 100644 lib/gitlab/backend/shell_adapter.rb
 create mode 100644 lib/gitlab/shell.rb
 create mode 100644 lib/gitlab/shell_adapter.rb

(limited to 'lib')

diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
deleted file mode 100644
index 82e194c1af1..00000000000
--- a/lib/gitlab/backend/shell.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-require 'securerandom'
-
-module Gitlab
-  class Shell
-    class Error < StandardError; end
-
-    KeyAdder = Struct.new(:io) do
-      def add_key(id, key)
-        key = Gitlab::Shell.strip_key(key)
-        # Newline and tab are part of the 'protocol' used to transmit id+key to the other end
-        if key.include?("\t") || key.include?("\n")
-          raise Error.new("Invalid key: #{key.inspect}")
-        end
-
-        io.puts("#{id}\t#{key}")
-      end
-    end
-
-    class << self
-      def secret_token
-        @secret_token ||= begin
-          File.read(Gitlab.config.gitlab_shell.secret_file).chomp
-        end
-      end
-
-      def ensure_secret_token!
-        return if File.exist?(File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret'))
-
-        generate_and_link_secret_token
-      end
-
-      def version_required
-        @version_required ||= File.read(Rails.root.
-                                        join('GITLAB_SHELL_VERSION')).strip
-      end
-
-      def strip_key(key)
-        key.split(/ /)[0, 2].join(' ')
-      end
-
-      private
-
-      # Create (if necessary) and link the secret token file
-      def generate_and_link_secret_token
-        secret_file = Gitlab.config.gitlab_shell.secret_file
-        shell_path = Gitlab.config.gitlab_shell.path
-
-        unless File.size?(secret_file)
-          # Generate a new token of 16 random hexadecimal characters and store it in secret_file.
-          @secret_token = SecureRandom.hex(16)
-          File.write(secret_file, @secret_token)
-        end
-
-        link_path = File.join(shell_path, '.gitlab_shell_secret')
-        if File.exist?(shell_path) && !File.exist?(link_path)
-          FileUtils.symlink(secret_file, link_path)
-        end
-      end
-    end
-
-    # Init new repository
-    #
-    # storage - project's storage path
-    # name - project path with namespace
-    #
-    # Ex.
-    #   add_repository("/path/to/storage", "gitlab/gitlab-ci")
-    #
-    def add_repository(storage, name)
-      Gitlab::Utils.system_silent([gitlab_shell_projects_path,
-                                   'add-project', storage, "#{name}.git"])
-    end
-
-    # Import repository
-    #
-    # storage - project's storage path
-    # name - project path with namespace
-    #
-    # Ex.
-    #   import_repository("/path/to/storage", "gitlab/gitlab-ci", "https://github.com/randx/six.git")
-    #
-    def import_repository(storage, name, url)
-      output, status = Popen::popen([gitlab_shell_projects_path, 'import-project',
-                                     storage, "#{name}.git", url, '900'])
-      raise Error, output unless status.zero?
-      true
-    end
-
-    # Move repository
-    # storage - project's storage path
-    # path - project path with namespace
-    # new_path - new project path with namespace
-    #
-    # Ex.
-    #   mv_repository("/path/to/storage", "gitlab/gitlab-ci", "randx/gitlab-ci-new")
-    #
-    def mv_repository(storage, path, new_path)
-      Gitlab::Utils.system_silent([gitlab_shell_projects_path, 'mv-project',
-                                   storage, "#{path}.git", "#{new_path}.git"])
-    end
-
-    # Fork repository to new namespace
-    # forked_from_storage - forked-from project's storage path
-    # path - project path with namespace
-    # forked_to_storage - forked-to project's storage path
-    # fork_namespace - namespace for forked project
-    #
-    # Ex.
-    #  fork_repository("/path/to/forked_from/storage", "gitlab/gitlab-ci", "/path/to/forked_to/storage", "randx")
-    #
-    def fork_repository(forked_from_storage, path, forked_to_storage, fork_namespace)
-      Gitlab::Utils.system_silent([gitlab_shell_projects_path, 'fork-project',
-                                   forked_from_storage, "#{path}.git", forked_to_storage,
-                                   fork_namespace])
-    end
-
-    # Remove repository from file system
-    #
-    # storage - project's storage path
-    # name - project path with namespace
-    #
-    # Ex.
-    #   remove_repository("/path/to/storage", "gitlab/gitlab-ci")
-    #
-    def remove_repository(storage, name)
-      Gitlab::Utils.system_silent([gitlab_shell_projects_path,
-                                   'rm-project', storage, "#{name}.git"])
-    end
-
-    # Add new key to gitlab-shell
-    #
-    # Ex.
-    #   add_key("key-42", "sha-rsa ...")
-    #
-    def add_key(key_id, key_content)
-      Gitlab::Utils.system_silent([gitlab_shell_keys_path,
-                                   'add-key', key_id, self.class.strip_key(key_content)])
-    end
-
-    # Batch-add keys to authorized_keys
-    #
-    # Ex.
-    #   batch_add_keys { |adder| adder.add_key("key-42", "sha-rsa ...") }
-    def batch_add_keys(&block)
-      IO.popen(%W(#{gitlab_shell_path}/bin/gitlab-keys batch-add-keys), 'w') do |io|
-        block.call(KeyAdder.new(io))
-      end
-    end
-
-    # Remove ssh key from gitlab shell
-    #
-    # Ex.
-    #   remove_key("key-342", "sha-rsa ...")
-    #
-    def remove_key(key_id, key_content)
-      Gitlab::Utils.system_silent([gitlab_shell_keys_path,
-                                   'rm-key', key_id, key_content])
-    end
-
-    # Remove all ssh keys from gitlab shell
-    #
-    # Ex.
-    #   remove_all_keys
-    #
-    def remove_all_keys
-      Gitlab::Utils.system_silent([gitlab_shell_keys_path, 'clear'])
-    end
-
-    # Add empty directory for storing repositories
-    #
-    # Ex.
-    #   add_namespace("/path/to/storage", "gitlab")
-    #
-    def add_namespace(storage, name)
-      FileUtils.mkdir(full_path(storage, name), mode: 0770) unless exists?(storage, name)
-    end
-
-    # Remove directory from repositories storage
-    # Every repository inside this directory will be removed too
-    #
-    # Ex.
-    #   rm_namespace("/path/to/storage", "gitlab")
-    #
-    def rm_namespace(storage, name)
-      FileUtils.rm_r(full_path(storage, name), force: true)
-    end
-
-    # Move namespace directory inside repositories storage
-    #
-    # Ex.
-    #   mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
-    #
-    def mv_namespace(storage, old_name, new_name)
-      return false if exists?(storage, new_name) || !exists?(storage, old_name)
-
-      FileUtils.mv(full_path(storage, old_name), full_path(storage, new_name))
-    end
-
-    def url_to_repo(path)
-      Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git"
-    end
-
-    # Return GitLab shell version
-    def version
-      gitlab_shell_version_file = "#{gitlab_shell_path}/VERSION"
-
-      if File.readable?(gitlab_shell_version_file)
-        File.read(gitlab_shell_version_file).chomp
-      end
-    end
-
-    # Check if such directory exists in repositories.
-    #
-    # Usage:
-    #   exists?(storage, 'gitlab')
-    #   exists?(storage, 'gitlab/cookies.git')
-    #
-    def exists?(storage, dir_name)
-      File.exist?(full_path(storage, dir_name))
-    end
-
-    protected
-
-    def gitlab_shell_path
-      Gitlab.config.gitlab_shell.path
-    end
-
-    def gitlab_shell_user_home
-      File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}")
-    end
-
-    def full_path(storage, dir_name)
-      raise ArgumentError.new("Directory name can't be blank") if dir_name.blank?
-
-      File.join(storage, dir_name)
-    end
-
-    def gitlab_shell_projects_path
-      File.join(gitlab_shell_path, 'bin', 'gitlab-projects')
-    end
-
-    def gitlab_shell_keys_path
-      File.join(gitlab_shell_path, 'bin', 'gitlab-keys')
-    end
-  end
-end
diff --git a/lib/gitlab/backend/shell_adapter.rb b/lib/gitlab/backend/shell_adapter.rb
deleted file mode 100644
index fbe2a7a0d72..00000000000
--- a/lib/gitlab/backend/shell_adapter.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# == GitLab Shell mixin
-#
-# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
-#
-module Gitlab
-  module ShellAdapter
-    def gitlab_shell
-      Gitlab::Shell.new
-    end
-  end
-end
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
new file mode 100644
index 00000000000..82e194c1af1
--- /dev/null
+++ b/lib/gitlab/shell.rb
@@ -0,0 +1,246 @@
+require 'securerandom'
+
+module Gitlab
+  class Shell
+    class Error < StandardError; end
+
+    KeyAdder = Struct.new(:io) do
+      def add_key(id, key)
+        key = Gitlab::Shell.strip_key(key)
+        # Newline and tab are part of the 'protocol' used to transmit id+key to the other end
+        if key.include?("\t") || key.include?("\n")
+          raise Error.new("Invalid key: #{key.inspect}")
+        end
+
+        io.puts("#{id}\t#{key}")
+      end
+    end
+
+    class << self
+      def secret_token
+        @secret_token ||= begin
+          File.read(Gitlab.config.gitlab_shell.secret_file).chomp
+        end
+      end
+
+      def ensure_secret_token!
+        return if File.exist?(File.join(Gitlab.config.gitlab_shell.path, '.gitlab_shell_secret'))
+
+        generate_and_link_secret_token
+      end
+
+      def version_required
+        @version_required ||= File.read(Rails.root.
+                                        join('GITLAB_SHELL_VERSION')).strip
+      end
+
+      def strip_key(key)
+        key.split(/ /)[0, 2].join(' ')
+      end
+
+      private
+
+      # Create (if necessary) and link the secret token file
+      def generate_and_link_secret_token
+        secret_file = Gitlab.config.gitlab_shell.secret_file
+        shell_path = Gitlab.config.gitlab_shell.path
+
+        unless File.size?(secret_file)
+          # Generate a new token of 16 random hexadecimal characters and store it in secret_file.
+          @secret_token = SecureRandom.hex(16)
+          File.write(secret_file, @secret_token)
+        end
+
+        link_path = File.join(shell_path, '.gitlab_shell_secret')
+        if File.exist?(shell_path) && !File.exist?(link_path)
+          FileUtils.symlink(secret_file, link_path)
+        end
+      end
+    end
+
+    # Init new repository
+    #
+    # storage - project's storage path
+    # name - project path with namespace
+    #
+    # Ex.
+    #   add_repository("/path/to/storage", "gitlab/gitlab-ci")
+    #
+    def add_repository(storage, name)
+      Gitlab::Utils.system_silent([gitlab_shell_projects_path,
+                                   'add-project', storage, "#{name}.git"])
+    end
+
+    # Import repository
+    #
+    # storage - project's storage path
+    # name - project path with namespace
+    #
+    # Ex.
+    #   import_repository("/path/to/storage", "gitlab/gitlab-ci", "https://github.com/randx/six.git")
+    #
+    def import_repository(storage, name, url)
+      output, status = Popen::popen([gitlab_shell_projects_path, 'import-project',
+                                     storage, "#{name}.git", url, '900'])
+      raise Error, output unless status.zero?
+      true
+    end
+
+    # Move repository
+    # storage - project's storage path
+    # path - project path with namespace
+    # new_path - new project path with namespace
+    #
+    # Ex.
+    #   mv_repository("/path/to/storage", "gitlab/gitlab-ci", "randx/gitlab-ci-new")
+    #
+    def mv_repository(storage, path, new_path)
+      Gitlab::Utils.system_silent([gitlab_shell_projects_path, 'mv-project',
+                                   storage, "#{path}.git", "#{new_path}.git"])
+    end
+
+    # Fork repository to new namespace
+    # forked_from_storage - forked-from project's storage path
+    # path - project path with namespace
+    # forked_to_storage - forked-to project's storage path
+    # fork_namespace - namespace for forked project
+    #
+    # Ex.
+    #  fork_repository("/path/to/forked_from/storage", "gitlab/gitlab-ci", "/path/to/forked_to/storage", "randx")
+    #
+    def fork_repository(forked_from_storage, path, forked_to_storage, fork_namespace)
+      Gitlab::Utils.system_silent([gitlab_shell_projects_path, 'fork-project',
+                                   forked_from_storage, "#{path}.git", forked_to_storage,
+                                   fork_namespace])
+    end
+
+    # Remove repository from file system
+    #
+    # storage - project's storage path
+    # name - project path with namespace
+    #
+    # Ex.
+    #   remove_repository("/path/to/storage", "gitlab/gitlab-ci")
+    #
+    def remove_repository(storage, name)
+      Gitlab::Utils.system_silent([gitlab_shell_projects_path,
+                                   'rm-project', storage, "#{name}.git"])
+    end
+
+    # Add new key to gitlab-shell
+    #
+    # Ex.
+    #   add_key("key-42", "sha-rsa ...")
+    #
+    def add_key(key_id, key_content)
+      Gitlab::Utils.system_silent([gitlab_shell_keys_path,
+                                   'add-key', key_id, self.class.strip_key(key_content)])
+    end
+
+    # Batch-add keys to authorized_keys
+    #
+    # Ex.
+    #   batch_add_keys { |adder| adder.add_key("key-42", "sha-rsa ...") }
+    def batch_add_keys(&block)
+      IO.popen(%W(#{gitlab_shell_path}/bin/gitlab-keys batch-add-keys), 'w') do |io|
+        block.call(KeyAdder.new(io))
+      end
+    end
+
+    # Remove ssh key from gitlab shell
+    #
+    # Ex.
+    #   remove_key("key-342", "sha-rsa ...")
+    #
+    def remove_key(key_id, key_content)
+      Gitlab::Utils.system_silent([gitlab_shell_keys_path,
+                                   'rm-key', key_id, key_content])
+    end
+
+    # Remove all ssh keys from gitlab shell
+    #
+    # Ex.
+    #   remove_all_keys
+    #
+    def remove_all_keys
+      Gitlab::Utils.system_silent([gitlab_shell_keys_path, 'clear'])
+    end
+
+    # Add empty directory for storing repositories
+    #
+    # Ex.
+    #   add_namespace("/path/to/storage", "gitlab")
+    #
+    def add_namespace(storage, name)
+      FileUtils.mkdir(full_path(storage, name), mode: 0770) unless exists?(storage, name)
+    end
+
+    # Remove directory from repositories storage
+    # Every repository inside this directory will be removed too
+    #
+    # Ex.
+    #   rm_namespace("/path/to/storage", "gitlab")
+    #
+    def rm_namespace(storage, name)
+      FileUtils.rm_r(full_path(storage, name), force: true)
+    end
+
+    # Move namespace directory inside repositories storage
+    #
+    # Ex.
+    #   mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
+    #
+    def mv_namespace(storage, old_name, new_name)
+      return false if exists?(storage, new_name) || !exists?(storage, old_name)
+
+      FileUtils.mv(full_path(storage, old_name), full_path(storage, new_name))
+    end
+
+    def url_to_repo(path)
+      Gitlab.config.gitlab_shell.ssh_path_prefix + "#{path}.git"
+    end
+
+    # Return GitLab shell version
+    def version
+      gitlab_shell_version_file = "#{gitlab_shell_path}/VERSION"
+
+      if File.readable?(gitlab_shell_version_file)
+        File.read(gitlab_shell_version_file).chomp
+      end
+    end
+
+    # Check if such directory exists in repositories.
+    #
+    # Usage:
+    #   exists?(storage, 'gitlab')
+    #   exists?(storage, 'gitlab/cookies.git')
+    #
+    def exists?(storage, dir_name)
+      File.exist?(full_path(storage, dir_name))
+    end
+
+    protected
+
+    def gitlab_shell_path
+      Gitlab.config.gitlab_shell.path
+    end
+
+    def gitlab_shell_user_home
+      File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}")
+    end
+
+    def full_path(storage, dir_name)
+      raise ArgumentError.new("Directory name can't be blank") if dir_name.blank?
+
+      File.join(storage, dir_name)
+    end
+
+    def gitlab_shell_projects_path
+      File.join(gitlab_shell_path, 'bin', 'gitlab-projects')
+    end
+
+    def gitlab_shell_keys_path
+      File.join(gitlab_shell_path, 'bin', 'gitlab-keys')
+    end
+  end
+end
diff --git a/lib/gitlab/shell_adapter.rb b/lib/gitlab/shell_adapter.rb
new file mode 100644
index 00000000000..fbe2a7a0d72
--- /dev/null
+++ b/lib/gitlab/shell_adapter.rb
@@ -0,0 +1,11 @@
+# == GitLab Shell mixin
+#
+# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
+#
+module Gitlab
+  module ShellAdapter
+    def gitlab_shell
+      Gitlab::Shell.new
+    end
+  end
+end
-- 
cgit v1.2.1


From 642bcb4d7c22ea6688751455670080c81c1149d4 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 26 Jan 2017 16:33:07 -0600
Subject: automatically correct CSS urls on assets:precompile

---
 lib/tasks/assets.rake | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 lib/tasks/assets.rake

(limited to 'lib')

diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
new file mode 100644
index 00000000000..aca2a318b31
--- /dev/null
+++ b/lib/tasks/assets.rake
@@ -0,0 +1,10 @@
+namespace :assets do
+  desc 'GitLab | Assets | Fix Absolute URLs in CSS'
+  task :precompile do
+    css_files = Dir['public/assets/*.css']
+    css_files.each do | file |
+      puts "Fixing #{file}"
+      system "sed", "-i", "-e", 's/url(\([\"\']\?\)\/assets\//url(\1.\//g', file
+    end
+  end
+end
-- 
cgit v1.2.1


From 0ed86119b08ed99d5fa193a5742a1d1de350d3a3 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 26 Jan 2017 16:33:22 -0600
Subject: correct gzip files if they exist as well

---
 lib/tasks/assets.rake | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'lib')

diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index aca2a318b31..33a0ad26d0e 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -3,8 +3,27 @@ namespace :assets do
   task :precompile do
     css_files = Dir['public/assets/*.css']
     css_files.each do | file |
+      # replace url(/assets/*) with url(./*)
       puts "Fixing #{file}"
       system "sed", "-i", "-e", 's/url(\([\"\']\?\)\/assets\//url(\1.\//g', file
+
+      # rewrite the corresponding gzip file (if it exists)
+      gzip = "#{file}.gz"
+      if File.exist?(gzip)
+        puts "Fixing #{gzip}"
+
+        FileUtils.rm(gzip)
+        mtime = File.stat(file).mtime
+
+        File.open(gzip, 'wb+') do |f|
+          gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+          gz.mtime = mtime
+          gz.write IO.binread(file)
+          gz.close
+
+          File.utime(mtime, mtime, f.path)
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 336d780d95ae30819262782e8ce079b58082a3e9 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 27 Jan 2017 12:58:50 -0600
Subject: namespace assets rake tasks to gitlab:assets:*

---
 lib/tasks/assets.rake        | 29 ---------------------------
 lib/tasks/gitlab/assets.rake | 47 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 29 deletions(-)
 delete mode 100644 lib/tasks/assets.rake
 create mode 100644 lib/tasks/gitlab/assets.rake

(limited to 'lib')

diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
deleted file mode 100644
index 33a0ad26d0e..00000000000
--- a/lib/tasks/assets.rake
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace :assets do
-  desc 'GitLab | Assets | Fix Absolute URLs in CSS'
-  task :precompile do
-    css_files = Dir['public/assets/*.css']
-    css_files.each do | file |
-      # replace url(/assets/*) with url(./*)
-      puts "Fixing #{file}"
-      system "sed", "-i", "-e", 's/url(\([\"\']\?\)\/assets\//url(\1.\//g', file
-
-      # rewrite the corresponding gzip file (if it exists)
-      gzip = "#{file}.gz"
-      if File.exist?(gzip)
-        puts "Fixing #{gzip}"
-
-        FileUtils.rm(gzip)
-        mtime = File.stat(file).mtime
-
-        File.open(gzip, 'wb+') do |f|
-          gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
-          gz.mtime = mtime
-          gz.write IO.binread(file)
-          gz.close
-
-          File.utime(mtime, mtime, f.path)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake
new file mode 100644
index 00000000000..5d884bf9f66
--- /dev/null
+++ b/lib/tasks/gitlab/assets.rake
@@ -0,0 +1,47 @@
+namespace :gitlab do
+  namespace :assets do
+    desc 'GitLab | Assets | Compile all frontend assets'
+    task :compile do
+      Rake::Task['assets:precompile'].invoke
+      Rake::Task['gitlab:assets:fix_urls'].invoke
+    end
+
+    desc 'GitLab | Assets | Clean up old compiled frontend assets'
+    task :clean do
+      Rake::Task['assets:clean'].invoke
+    end
+
+    desc 'GitLab | Assets | Remove all compiled frontend assets'
+    task :purge do
+      Rake::Task['assets:clobber'].invoke
+    end
+
+    desc 'GitLab | Assets | Fix all absolute url references in CSS'
+    task :fix_urls do
+      css_files = Dir['public/assets/*.css']
+      css_files.each do | file |
+        # replace url(/assets/*) with url(./*)
+        puts "Fixing #{file}"
+        system "sed", "-i", "-e", 's/url(\([\"\']\?\)\/assets\//url(\1.\//g', file
+
+        # rewrite the corresponding gzip file (if it exists)
+        gzip = "#{file}.gz"
+        if File.exist?(gzip)
+          puts "Fixing #{gzip}"
+
+          FileUtils.rm(gzip)
+          mtime = File.stat(file).mtime
+
+          File.open(gzip, 'wb+') do |f|
+            gz = Zlib::GzipWriter.new(f, Zlib::BEST_COMPRESSION)
+            gz.mtime = mtime
+            gz.write IO.binread(file)
+            gz.close
+
+            File.utime(mtime, mtime, f.path)
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 7e51cd32d3ed8bf6320b69b7976a8b10d168edba Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 27 Jan 2017 14:36:52 -0600
Subject: update scripts and docs to reference the newly namespaced rake task

---
 lib/gitlab/upgrader.rb       | 2 +-
 lib/support/deploy/deploy.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index f3567f3ef85..e78d0c34a02 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -61,7 +61,7 @@ module Gitlab
         "Switch to new version" => %W(#{Gitlab.config.git.bin_path} checkout v#{latest_version}),
         "Install gems" => %W(bundle),
         "Migrate DB" => %W(bundle exec rake db:migrate),
-        "Recompile assets" => %W(bundle exec rake assets:clean assets:precompile),
+        "Recompile assets" => %W(bundle exec rake gitlab:assets:clean gitlab:assets:compile),
         "Clear cache" => %W(bundle exec rake cache:clear)
       }
     end
diff --git a/lib/support/deploy/deploy.sh b/lib/support/deploy/deploy.sh
index adea4c7a747..ab46c47d8f5 100755
--- a/lib/support/deploy/deploy.sh
+++ b/lib/support/deploy/deploy.sh
@@ -31,8 +31,8 @@ echo 'Deploy: Bundle and migrate'
 sudo -u git -H bundle --without aws development test mysql --deployment
 
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
-sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
-sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
+sudo -u git -H bundle exec rake gitlab:assets:clean RAILS_ENV=production
+sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production
 sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
 
 # return stashed changes (if necessary)
-- 
cgit v1.2.1


From dc6921bdbbabd08be4426345140cb507b286eac7 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 10 Jan 2017 19:43:58 +0100
Subject: Chat Commands have presenters

This improves the styling and readability of the code. This is supported
by both Mattermost and Slack.
---
 lib/gitlab/chat_commands/base_command.rb           |   4 -
 lib/gitlab/chat_commands/command.rb                |  22 +--
 lib/gitlab/chat_commands/deploy.rb                 |  24 ++--
 lib/gitlab/chat_commands/issue_create.rb           |  18 ++-
 lib/gitlab/chat_commands/issue_search.rb           |  10 +-
 lib/gitlab/chat_commands/issue_show.rb             |   8 +-
 lib/gitlab/chat_commands/presenter.rb              | 131 -----------------
 lib/gitlab/chat_commands/presenters/access.rb      |  22 +++
 lib/gitlab/chat_commands/presenters/base.rb        |  73 ++++++++++
 lib/gitlab/chat_commands/presenters/deploy.rb      |  24 ++++
 lib/gitlab/chat_commands/presenters/issuable.rb    |  33 +++++
 lib/gitlab/chat_commands/presenters/list_issues.rb |  32 +++++
 lib/gitlab/chat_commands/presenters/show_issue.rb  |  38 +++++
 lib/mattermost/error.rb                            |   3 -
 lib/mattermost/session.rb                          | 160 ---------------------
 15 files changed, 266 insertions(+), 336 deletions(-)
 delete mode 100644 lib/gitlab/chat_commands/presenter.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/access.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/base.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/deploy.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/issuable.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/list_issues.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/show_issue.rb
 delete mode 100644 lib/mattermost/error.rb
 delete mode 100644 lib/mattermost/session.rb

(limited to 'lib')

diff --git a/lib/gitlab/chat_commands/base_command.rb b/lib/gitlab/chat_commands/base_command.rb
index 4fe53ce93a9..25da8474e95 100644
--- a/lib/gitlab/chat_commands/base_command.rb
+++ b/lib/gitlab/chat_commands/base_command.rb
@@ -42,10 +42,6 @@ module Gitlab
       def find_by_iid(iid)
         collection.find_by(iid: iid)
       end
-
-      def presenter
-        Gitlab::ChatCommands::Presenter.new
-      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/command.rb b/lib/gitlab/chat_commands/command.rb
index 145086755e4..ac7ee868402 100644
--- a/lib/gitlab/chat_commands/command.rb
+++ b/lib/gitlab/chat_commands/command.rb
@@ -13,9 +13,9 @@ module Gitlab
 
         if command
           if command.allowed?(project, current_user)
-            present command.new(project, current_user, params).execute(match)
+            command.new(project, current_user, params).execute(match)
           else
-            access_denied
+            Gitlab::ChatCommands::Presenters::Access.new.access_denied
           end
         else
           help(help_messages)
@@ -25,7 +25,7 @@ module Gitlab
       def match_command
         match = nil
         service = available_commands.find do |klass|
-          match = klass.match(command)
+          match = klass.match(params[:text])
         end
 
         [service, match]
@@ -42,22 +42,6 @@ module Gitlab
           klass.available?(project)
         end
       end
-
-      def command
-        params[:text]
-      end
-
-      def help(messages)
-        presenter.help(messages, params[:command])
-      end
-
-      def access_denied
-        presenter.access_denied
-      end
-
-      def present(resource)
-        presenter.present(resource)
-      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/deploy.rb b/lib/gitlab/chat_commands/deploy.rb
index 7127d2f6d04..458d90f84e8 100644
--- a/lib/gitlab/chat_commands/deploy.rb
+++ b/lib/gitlab/chat_commands/deploy.rb
@@ -1,8 +1,6 @@
 module Gitlab
   module ChatCommands
     class Deploy < BaseCommand
-      include Gitlab::Routing.url_helpers
-
       def self.match(text)
         /\Adeploy\s+(?<from>\S+.*)\s+to+\s+(?<to>\S+.*)\z/.match(text)
       end
@@ -24,35 +22,29 @@ module Gitlab
         to = match[:to]
 
         actions = find_actions(from, to)
-        return unless actions.present?
 
-        if actions.one?
-          play!(from, to, actions.first)
+        if actions.none?
+          Gitlab::ChatCommands::Presenters::Deploy.new(nil).no_actions
+        elsif actions.one?
+          action = play!(from, to, actions.first)
+          Gitlab::ChatCommands::Presenters::Deploy.new(action).present(from, to)
         else
-          Result.new(:error, 'Too many actions defined')
+          Gitlab::ChatCommands::Presenters::Deploy.new(actions).too_many_actions
         end
       end
 
       private
 
       def play!(from, to, action)
-        new_action = action.play(current_user)
-
-        Result.new(:success, "Deployment from #{from} to #{to} started. Follow the progress: #{url(new_action)}.")
+        action.play(current_user)
       end
 
       def find_actions(from, to)
         environment = project.environments.find_by(name: from)
-        return unless environment
+        return [] unless environment
 
         environment.actions_for(to).select(&:starts_environment?)
       end
-
-      def url(subject)
-        polymorphic_url(
-          [subject.project.namespace.becomes(Namespace), subject.project, subject]
-        )
-      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/issue_create.rb b/lib/gitlab/chat_commands/issue_create.rb
index cefb6775db8..a06f13b0f72 100644
--- a/lib/gitlab/chat_commands/issue_create.rb
+++ b/lib/gitlab/chat_commands/issue_create.rb
@@ -2,7 +2,7 @@ module Gitlab
   module ChatCommands
     class IssueCreate < IssueCommand
       def self.match(text)
-        # we can not match \n with the dot by passing the m modifier as than 
+        # we can not match \n with the dot by passing the m modifier as than
         # the title and description are not seperated
         /\Aissue\s+(new|create)\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/.match(text)
       end
@@ -19,8 +19,24 @@ module Gitlab
         title = match[:title]
         description = match[:description].to_s.rstrip
 
+        issue = create_issue(title: title, description: description)
+
+        if issue.errors.any?
+          presenter(issue).display_errors
+        else
+          presenter(issue).present
+        end
+      end
+
+      private
+
+      def create_issue(title:, description:)
         Issues::CreateService.new(project, current_user, title: title, description: description).execute
       end
+
+      def presenter(issue)
+        Gitlab::ChatCommands::Presenters::ShowIssue.new(issue)
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/issue_search.rb b/lib/gitlab/chat_commands/issue_search.rb
index 51bf80c800b..e2d3a0f466a 100644
--- a/lib/gitlab/chat_commands/issue_search.rb
+++ b/lib/gitlab/chat_commands/issue_search.rb
@@ -10,7 +10,15 @@ module Gitlab
       end
 
       def execute(match)
-        collection.search(match[:query]).limit(QUERY_LIMIT)
+        issues = collection.search(match[:query]).limit(QUERY_LIMIT)
+
+        if issues.none?
+          Presenters::Access.new(issues).not_found
+        elsif issues.one?
+          Presenters::ShowIssue.new(issues.first).present
+        else
+          Presenters::ListIssues.new(issues).present
+        end
       end
     end
   end
diff --git a/lib/gitlab/chat_commands/issue_show.rb b/lib/gitlab/chat_commands/issue_show.rb
index 2a45d49cf6b..9f3e1b9a64b 100644
--- a/lib/gitlab/chat_commands/issue_show.rb
+++ b/lib/gitlab/chat_commands/issue_show.rb
@@ -10,7 +10,13 @@ module Gitlab
       end
 
       def execute(match)
-        find_by_iid(match[:iid])
+        issue = find_by_iid(match[:iid])
+
+        if issue
+          Gitlab::ChatCommands::Presenters::ShowIssue.new(issue).present
+        else
+          Gitlab::ChatCommands::Presenters::Access.new.not_found
+        end
       end
     end
   end
diff --git a/lib/gitlab/chat_commands/presenter.rb b/lib/gitlab/chat_commands/presenter.rb
deleted file mode 100644
index 8930a21f406..00000000000
--- a/lib/gitlab/chat_commands/presenter.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-module Gitlab
-  module ChatCommands
-    class Presenter
-      include Gitlab::Routing
-
-      def authorize_chat_name(url)
-        message = if url
-                    ":wave: Hi there! Before I do anything for you, please [connect your GitLab account](#{url})."
-                  else
-                    ":sweat_smile: Couldn't identify you, nor can I autorize you!"
-                  end
-
-        ephemeral_response(message)
-      end
-
-      def help(commands, trigger)
-        if commands.none?
-          ephemeral_response("No commands configured")
-        else
-          commands.map! { |command| "#{trigger} #{command}" }
-          message = header_with_list("Available commands", commands)
-
-          ephemeral_response(message)
-        end
-      end
-
-      def present(subject)
-        return not_found unless subject
-
-        if subject.is_a?(Gitlab::ChatCommands::Result)
-          show_result(subject)
-        elsif subject.respond_to?(:count)
-          if subject.none?
-            not_found
-          elsif subject.one?
-            single_resource(subject.first)
-          else
-            multiple_resources(subject)
-          end
-        else
-          single_resource(subject)
-        end
-      end
-
-      def access_denied
-        ephemeral_response("Whoops! That action is not allowed. This incident will be [reported](https://xkcd.com/838/).")
-      end
-
-      private
-
-      def show_result(result)
-        case result.type
-        when :success
-          in_channel_response(result.message)
-        else
-          ephemeral_response(result.message)
-        end
-      end
-
-      def not_found
-        ephemeral_response("404 not found! GitLab couldn't find what you were looking for! :boom:")
-      end
-
-      def single_resource(resource)
-        return error(resource) if resource.errors.any? || !resource.persisted?
-
-        message = "#{title(resource)}:"
-        message << "\n\n#{resource.description}" if resource.try(:description)
-
-        in_channel_response(message)
-      end
-
-      def multiple_resources(resources)
-        titles = resources.map { |resource| title(resource) }
-
-        message = header_with_list("Multiple results were found:", titles)
-
-        ephemeral_response(message)
-      end
-
-      def error(resource)
-        message = header_with_list("The action was not successful, because:", resource.errors.messages)
-
-        ephemeral_response(message)
-      end
-
-      def title(resource)
-        reference = resource.try(:to_reference) || resource.try(:id)
-        title = resource.try(:title) || resource.try(:name)
-
-        "[#{reference} #{title}](#{url(resource)})"
-      end
-
-      def header_with_list(header, items)
-        message = [header]
-
-        items.each do |item|
-          message << "- #{item}"
-        end
-
-        message.join("\n")
-      end
-
-      def url(resource)
-        url_for(
-          [
-            resource.project.namespace.becomes(Namespace),
-            resource.project,
-            resource
-          ]
-        )
-      end
-
-      def ephemeral_response(message)
-        {
-          response_type: :ephemeral,
-          text: message,
-          status: 200
-        }
-      end
-
-      def in_channel_response(message)
-        {
-          response_type: :in_channel,
-          text: message,
-          status: 200
-        }
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/chat_commands/presenters/access.rb b/lib/gitlab/chat_commands/presenters/access.rb
new file mode 100644
index 00000000000..6d18d745608
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/access.rb
@@ -0,0 +1,22 @@
+module Gitlab::ChatCommands::Presenters
+  class Access < Gitlab::ChatCommands::Presenters::Base
+    def access_denied
+      ephemeral_response(text: "Whoops! This action is not allowed. This incident will be [reported](https://xkcd.com/838/).")
+    end
+
+    def not_found
+      ephemeral_response(text: "404 not found! GitLab couldn't find what you were looking for! :boom:")
+    end
+
+    def authorize
+      message =
+        if @resource
+          ":wave: Hi there! Before I do anything for you, please [connect your GitLab account](#{@resource})."
+        else
+          ":sweat_smile: Couldn't identify you, nor can I autorize you!"
+        end
+
+      ephemeral_response(text: message)
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/base.rb b/lib/gitlab/chat_commands/presenters/base.rb
new file mode 100644
index 00000000000..0897025d85f
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/base.rb
@@ -0,0 +1,73 @@
+module Gitlab::ChatCommands::Presenters
+  class Base
+    include Gitlab::Routing.url_helpers
+
+    def initialize(resource = nil)
+      @resource = resource
+    end
+
+    def display_errors
+      message = header_with_list("The action was not successful, because:", @resource.errors.full_messages)
+
+      ephemeral_response(text: message)
+    end
+
+    private
+
+    def header_with_list(header, items)
+      message = [header]
+
+      items.each do |item|
+        message << "- #{item}"
+      end
+
+      message.join("\n")
+    end
+
+    def ephemeral_response(message)
+      response = {
+        response_type: :ephemeral,
+        status: 200
+      }.merge(message)
+
+      format_response(response)
+    end
+
+    def in_channel_response(message)
+      response = {
+        response_type: :in_channel,
+        status: 200
+      }.merge(message)
+
+      format_response(response)
+    end
+
+    def format_response(response)
+      response[:text] = format(response[:text]) if response.has_key?(:text)
+
+      if response.has_key?(:attachments)
+        response[:attachments].each do |attachment|
+          attachment[:pretext] = format(attachment[:pretext]) if attachment[:pretext]
+          attachment[:text] = format(attachment[:text]) if attachment[:text]
+        end
+      end
+
+      response
+    end
+
+    # Convert Markdown to slacks format
+    def format(string)
+      Slack::Notifier::LinkFormatter.format(string)
+    end
+
+    def resource_url
+      url_for(
+        [
+          @resource.project.namespace.becomes(Namespace),
+          @resource.project,
+          @resource
+        ]
+      )
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/deploy.rb b/lib/gitlab/chat_commands/presenters/deploy.rb
new file mode 100644
index 00000000000..4f6333812ff
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/deploy.rb
@@ -0,0 +1,24 @@
+module Gitlab::ChatCommands::Presenters
+  class Deploy < Gitlab::ChatCommands::Presenters::Base
+    def present(from, to)
+      message = "Deployment started from #{from} to #{to}. [Follow its progress](#{resource_url})."
+      in_channel_response(text: message)
+    end
+
+    def no_actions
+      ephemeral_response(text: "No action found to be executed")
+    end
+
+    def too_many_actions
+      ephemeral_response(text: "Too many actions defined")
+    end
+
+    private
+
+    def resource_url
+      polymorphic_url(
+        [ @resource.project.namespace.becomes(Namespace), @resource.project, @resource]
+      )
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/issuable.rb b/lib/gitlab/chat_commands/presenters/issuable.rb
new file mode 100644
index 00000000000..9623387f188
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/issuable.rb
@@ -0,0 +1,33 @@
+module Gitlab::ChatCommands::Presenters
+  class Issuable < Gitlab::ChatCommands::Presenters::Base
+    private
+
+    def project
+      @resource.project
+    end
+
+    def author
+      @resource.author
+    end
+
+    def fields
+      [
+        {
+          title: "Assignee",
+          value: @resource.assignee ? @resource.assignee.name : "_None_",
+          short: true
+        },
+        {
+          title: "Milestone",
+          value: @resource.milestone ? @resource.milestone.title : "_None_",
+          short: true
+        },
+        {
+          title: "Labels",
+          value: @resource.labels.any? ? @resource.label_names : "_None_",
+          short: true
+        }
+      ]
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/list_issues.rb b/lib/gitlab/chat_commands/presenters/list_issues.rb
new file mode 100644
index 00000000000..5a7b3fca5c2
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/list_issues.rb
@@ -0,0 +1,32 @@
+module Gitlab::ChatCommands::Presenters
+  class ListIssues < Gitlab::ChatCommands::Presenters::Base
+    def present
+      ephemeral_response(text: "Here are the issues I found:", attachments: attachments)
+    end
+
+    private
+
+    def attachments
+      @resource.map do |issue|
+        state = issue.open? ? "Open" : "Closed"
+
+        {
+          fallback: "Issue #{issue.to_reference}: #{issue.title}",
+          color: "#d22852",
+          text: "[#{issue.to_reference}](#{url_for([namespace, project, issue])}) · #{issue.title} (#{state})",
+          mrkdwn_in: [
+            "text"
+          ]
+        }
+      end
+    end
+
+    def project
+      @project ||= @resource.first.project
+    end
+
+    def namespace
+      @namespace ||= project.namespace.becomes(Namespace)
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/show_issue.rb b/lib/gitlab/chat_commands/presenters/show_issue.rb
new file mode 100644
index 00000000000..2a89c30b972
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/show_issue.rb
@@ -0,0 +1,38 @@
+module Gitlab::ChatCommands::Presenters
+  class ShowIssue < Gitlab::ChatCommands::Presenters::Issuable
+    def present
+      in_channel_response(show_issue)
+    end
+
+    private
+
+    def show_issue
+      {
+        attachments: [
+          {
+            title:        @resource.title,
+            title_link:   resource_url,
+            author_name:  author.name,
+            author_icon:  author.avatar_url,
+            fallback:     "#{@resource.to_reference}: #{@resource.title}",
+            text:         text,
+            fields:       fields,
+            mrkdwn_in: [
+              :title,
+              :text
+            ]
+          }
+        ]
+      }
+    end
+
+    def text
+      message = ""
+      message << ":+1: #{@resource.upvotes} " unless @resource.upvotes.zero?
+      message << ":-1: #{@resource.downvotes} " unless @resource.downvotes.zero?
+      message << ":speech_balloon: #{@resource.user_notes_count}" unless @resource.user_notes_count.zero?
+
+      message
+    end
+  end
+end
diff --git a/lib/mattermost/error.rb b/lib/mattermost/error.rb
deleted file mode 100644
index 014df175be0..00000000000
--- a/lib/mattermost/error.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Mattermost
-  class Error < StandardError; end
-end
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
deleted file mode 100644
index 377cb7b1021..00000000000
--- a/lib/mattermost/session.rb
+++ /dev/null
@@ -1,160 +0,0 @@
-module Mattermost
-  class NoSessionError < Mattermost::Error
-    def message
-      'No session could be set up, is Mattermost configured with Single Sign On?'
-    end
-  end
-
-  class ConnectionError < Mattermost::Error; end
-
-  # This class' prime objective is to obtain a session token on a Mattermost
-  # instance with SSO configured where this GitLab instance is the provider.
-  #
-  # The process depends on OAuth, but skips a step in the authentication cycle.
-  # For example, usually a user would click the 'login in GitLab' button on
-  # Mattermost, which would yield a 302 status code and redirects you to GitLab
-  # to approve the use of your account on Mattermost. Which would trigger a
-  # callback so Mattermost knows this request is approved and gets the required
-  # data to create the user account etc.
-  #
-  # This class however skips the button click, and also the approval phase to
-  # speed up the process and keep it without manual action and get a session
-  # going.
-  class Session
-    include Doorkeeper::Helpers::Controller
-    include HTTParty
-
-    LEASE_TIMEOUT = 60
-
-    base_uri Settings.mattermost.host
-
-    attr_accessor :current_resource_owner, :token
-
-    def initialize(current_user)
-      @current_resource_owner = current_user
-    end
-
-    def with_session
-      with_lease do
-        raise Mattermost::NoSessionError unless create
-
-        begin
-          yield self
-        rescue Errno::ECONNREFUSED
-          raise Mattermost::NoSessionError
-        ensure
-          destroy
-        end
-      end
-    end
-
-    # Next methods are needed for Doorkeeper
-    def pre_auth
-      @pre_auth ||= Doorkeeper::OAuth::PreAuthorization.new(
-        Doorkeeper.configuration, server.client_via_uid, params)
-    end
-
-    def authorization
-      @authorization ||= strategy.request
-    end
-
-    def strategy
-      @strategy ||= server.authorization_request(pre_auth.response_type)
-    end
-
-    def request
-      @request ||= OpenStruct.new(parameters: params)
-    end
-
-    def params
-      Rack::Utils.parse_query(oauth_uri.query).symbolize_keys
-    end
-
-    def get(path, options = {})
-      handle_exceptions do
-        self.class.get(path, options.merge(headers: @headers))
-      end
-    end
-
-    def post(path, options = {})
-      handle_exceptions do
-        self.class.post(path, options.merge(headers: @headers))
-      end
-    end
-
-    private
-
-    def create
-      return unless oauth_uri
-      return unless token_uri
-
-      @token = request_token
-      @headers = {
-        Authorization: "Bearer #{@token}"
-      }
-
-      @token
-    end
-
-    def destroy
-      post('/api/v3/users/logout')
-    end
-
-    def oauth_uri
-      return @oauth_uri if defined?(@oauth_uri)
-
-      @oauth_uri = nil
-
-      response = get("/api/v3/oauth/gitlab/login", follow_redirects: false)
-      return unless 300 <= response.code && response.code < 400
-
-      redirect_uri = response.headers['location']
-      return unless redirect_uri
-
-      @oauth_uri = URI.parse(redirect_uri)
-    end
-
-    def token_uri
-      @token_uri ||=
-        if oauth_uri
-          authorization.authorize.redirect_uri if pre_auth.authorizable?
-        end
-    end
-
-    def request_token
-      response = get(token_uri, follow_redirects: false)
-
-      if 200 <= response.code && response.code < 400
-        response.headers['token']
-      end
-    end
-
-    def with_lease
-      lease_uuid = lease_try_obtain
-      raise NoSessionError unless lease_uuid
-
-      begin
-        yield
-      ensure
-        Gitlab::ExclusiveLease.cancel(lease_key, lease_uuid)
-      end
-    end
-
-    def lease_key
-      "mattermost:session"
-    end
-
-    def lease_try_obtain
-      lease = ::Gitlab::ExclusiveLease.new(lease_key, timeout: LEASE_TIMEOUT)
-      lease.try_obtain
-    end
-
-    def handle_exceptions
-      yield
-    rescue HTTParty::Error => e
-      raise Mattermost::ConnectionError.new(e.message)
-    rescue Errno::ECONNREFUSED
-      raise Mattermost::ConnectionError.new(e.message)
-    end
-  end
-end
-- 
cgit v1.2.1


From 746f47208dc52cd6ca68c0893de5513c250f524b Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Wed, 11 Jan 2017 08:54:44 -0500
Subject: Revert removing of some files

---
 lib/mattermost/command.rb |   4 ++
 lib/mattermost/error.rb   |   3 +
 lib/mattermost/session.rb | 160 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 167 insertions(+)
 create mode 100644 lib/mattermost/error.rb
 create mode 100644 lib/mattermost/session.rb

(limited to 'lib')

diff --git a/lib/mattermost/command.rb b/lib/mattermost/command.rb
index 33e450d7f0a..2e4f7705f86 100644
--- a/lib/mattermost/command.rb
+++ b/lib/mattermost/command.rb
@@ -1,7 +1,11 @@
 module Mattermost
   class Command < Client
     def create(params)
+<<<<<<< HEAD
       response = session_post("/api/v3/teams/#{params[:team_id]}/commands/create",
+=======
+      response = json_post("/api/v3/teams/#{params[:team_id]}/commands/create",
+>>>>>>> Revert removing of some files
         body: params.to_json)
 
       response['token']
diff --git a/lib/mattermost/error.rb b/lib/mattermost/error.rb
new file mode 100644
index 00000000000..014df175be0
--- /dev/null
+++ b/lib/mattermost/error.rb
@@ -0,0 +1,3 @@
+module Mattermost
+  class Error < StandardError; end
+end
diff --git a/lib/mattermost/session.rb b/lib/mattermost/session.rb
new file mode 100644
index 00000000000..377cb7b1021
--- /dev/null
+++ b/lib/mattermost/session.rb
@@ -0,0 +1,160 @@
+module Mattermost
+  class NoSessionError < Mattermost::Error
+    def message
+      'No session could be set up, is Mattermost configured with Single Sign On?'
+    end
+  end
+
+  class ConnectionError < Mattermost::Error; end
+
+  # This class' prime objective is to obtain a session token on a Mattermost
+  # instance with SSO configured where this GitLab instance is the provider.
+  #
+  # The process depends on OAuth, but skips a step in the authentication cycle.
+  # For example, usually a user would click the 'login in GitLab' button on
+  # Mattermost, which would yield a 302 status code and redirects you to GitLab
+  # to approve the use of your account on Mattermost. Which would trigger a
+  # callback so Mattermost knows this request is approved and gets the required
+  # data to create the user account etc.
+  #
+  # This class however skips the button click, and also the approval phase to
+  # speed up the process and keep it without manual action and get a session
+  # going.
+  class Session
+    include Doorkeeper::Helpers::Controller
+    include HTTParty
+
+    LEASE_TIMEOUT = 60
+
+    base_uri Settings.mattermost.host
+
+    attr_accessor :current_resource_owner, :token
+
+    def initialize(current_user)
+      @current_resource_owner = current_user
+    end
+
+    def with_session
+      with_lease do
+        raise Mattermost::NoSessionError unless create
+
+        begin
+          yield self
+        rescue Errno::ECONNREFUSED
+          raise Mattermost::NoSessionError
+        ensure
+          destroy
+        end
+      end
+    end
+
+    # Next methods are needed for Doorkeeper
+    def pre_auth
+      @pre_auth ||= Doorkeeper::OAuth::PreAuthorization.new(
+        Doorkeeper.configuration, server.client_via_uid, params)
+    end
+
+    def authorization
+      @authorization ||= strategy.request
+    end
+
+    def strategy
+      @strategy ||= server.authorization_request(pre_auth.response_type)
+    end
+
+    def request
+      @request ||= OpenStruct.new(parameters: params)
+    end
+
+    def params
+      Rack::Utils.parse_query(oauth_uri.query).symbolize_keys
+    end
+
+    def get(path, options = {})
+      handle_exceptions do
+        self.class.get(path, options.merge(headers: @headers))
+      end
+    end
+
+    def post(path, options = {})
+      handle_exceptions do
+        self.class.post(path, options.merge(headers: @headers))
+      end
+    end
+
+    private
+
+    def create
+      return unless oauth_uri
+      return unless token_uri
+
+      @token = request_token
+      @headers = {
+        Authorization: "Bearer #{@token}"
+      }
+
+      @token
+    end
+
+    def destroy
+      post('/api/v3/users/logout')
+    end
+
+    def oauth_uri
+      return @oauth_uri if defined?(@oauth_uri)
+
+      @oauth_uri = nil
+
+      response = get("/api/v3/oauth/gitlab/login", follow_redirects: false)
+      return unless 300 <= response.code && response.code < 400
+
+      redirect_uri = response.headers['location']
+      return unless redirect_uri
+
+      @oauth_uri = URI.parse(redirect_uri)
+    end
+
+    def token_uri
+      @token_uri ||=
+        if oauth_uri
+          authorization.authorize.redirect_uri if pre_auth.authorizable?
+        end
+    end
+
+    def request_token
+      response = get(token_uri, follow_redirects: false)
+
+      if 200 <= response.code && response.code < 400
+        response.headers['token']
+      end
+    end
+
+    def with_lease
+      lease_uuid = lease_try_obtain
+      raise NoSessionError unless lease_uuid
+
+      begin
+        yield
+      ensure
+        Gitlab::ExclusiveLease.cancel(lease_key, lease_uuid)
+      end
+    end
+
+    def lease_key
+      "mattermost:session"
+    end
+
+    def lease_try_obtain
+      lease = ::Gitlab::ExclusiveLease.new(lease_key, timeout: LEASE_TIMEOUT)
+      lease.try_obtain
+    end
+
+    def handle_exceptions
+      yield
+    rescue HTTParty::Error => e
+      raise Mattermost::ConnectionError.new(e.message)
+    rescue Errno::ECONNREFUSED
+      raise Mattermost::ConnectionError.new(e.message)
+    end
+  end
+end
-- 
cgit v1.2.1


From 53846da2c7fe3879b4f26383d6367b0bb69e5dc8 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Wed, 11 Jan 2017 09:04:49 -0500
Subject: Add help command

---
 lib/gitlab/chat_commands/command.rb         | 13 +++++--------
 lib/gitlab/chat_commands/help.rb            | 28 ++++++++++++++++++++++++++++
 lib/gitlab/chat_commands/presenters/help.rb | 20 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 lib/gitlab/chat_commands/help.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/help.rb

(limited to 'lib')

diff --git a/lib/gitlab/chat_commands/command.rb b/lib/gitlab/chat_commands/command.rb
index ac7ee868402..4e5031a8a26 100644
--- a/lib/gitlab/chat_commands/command.rb
+++ b/lib/gitlab/chat_commands/command.rb
@@ -18,25 +18,22 @@ module Gitlab
             Gitlab::ChatCommands::Presenters::Access.new.access_denied
           end
         else
-          help(help_messages)
+          Gitlab::ChatCommands::Help.new(project, current_user, params).execute(available_commands)
         end
       end
 
       def match_command
         match = nil
-        service = available_commands.find do |klass|
-          match = klass.match(params[:text])
-        end
+        service =
+          available_commands.find do |klass|
+            match = klass.match(params[:text])
+          end
 
         [service, match]
       end
 
       private
 
-      def help_messages
-        available_commands.map(&:help_message)
-      end
-
       def available_commands
         COMMANDS.select do |klass|
           klass.available?(project)
diff --git a/lib/gitlab/chat_commands/help.rb b/lib/gitlab/chat_commands/help.rb
new file mode 100644
index 00000000000..e76733f5445
--- /dev/null
+++ b/lib/gitlab/chat_commands/help.rb
@@ -0,0 +1,28 @@
+module Gitlab
+  module ChatCommands
+    class Help < BaseCommand
+      # This class has to be used last, as it always matches. It has to match
+      # because other commands were not triggered and we want to show the help
+      # command
+      def self.match(_text)
+        true
+      end
+
+      def self.help_message
+        'help'
+      end
+
+      def self.allowed?(_project, _user)
+        true
+      end
+
+      def execute(commands)
+        Gitlab::ChatCommands::Presenters::Help.new(commands).present(trigger)
+      end
+
+      def trigger
+        params[:command]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/help.rb b/lib/gitlab/chat_commands/presenters/help.rb
new file mode 100644
index 00000000000..133b707231f
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/help.rb
@@ -0,0 +1,20 @@
+module Gitlab::ChatCommands::Presenters
+  class Help < Gitlab::ChatCommands::Presenters::Base
+    def present(trigger)
+      message =
+        if @resource.none?
+          "No commands available :thinking_face:"
+        else
+          header_with_list("Available commands", full_commands(trigger))
+        end
+
+      ephemeral_response(text: message)
+    end
+
+    private
+
+    def full_commands(trigger)
+      @resource.map { |command| "#{trigger} #{command.help_message}" }
+    end
+  end
+end
-- 
cgit v1.2.1


From 4ce1a17c9767a80dfae0b47cee236d2a5d88918b Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Thu, 19 Jan 2017 09:22:09 +0100
Subject: Incorporate feedback

---
 lib/gitlab/chat_commands/issue_create.rb           |   2 +-
 lib/gitlab/chat_commands/presenters/access.rb      |  36 ++++---
 lib/gitlab/chat_commands/presenters/base.rb        | 112 +++++++++++----------
 lib/gitlab/chat_commands/presenters/deploy.rb      |  39 +++----
 lib/gitlab/chat_commands/presenters/help.rb        |  31 +++---
 lib/gitlab/chat_commands/presenters/issuable.rb    |  66 +++++++-----
 lib/gitlab/chat_commands/presenters/list_issues.rb |  59 ++++++-----
 lib/gitlab/chat_commands/presenters/new_issue.rb   |  42 ++++++++
 lib/gitlab/chat_commands/presenters/show_issue.rb  |  72 +++++++------
 9 files changed, 279 insertions(+), 180 deletions(-)
 create mode 100644 lib/gitlab/chat_commands/presenters/new_issue.rb

(limited to 'lib')

diff --git a/lib/gitlab/chat_commands/issue_create.rb b/lib/gitlab/chat_commands/issue_create.rb
index a06f13b0f72..3f3d7de8b2e 100644
--- a/lib/gitlab/chat_commands/issue_create.rb
+++ b/lib/gitlab/chat_commands/issue_create.rb
@@ -35,7 +35,7 @@ module Gitlab
       end
 
       def presenter(issue)
-        Gitlab::ChatCommands::Presenters::ShowIssue.new(issue)
+        Gitlab::ChatCommands::Presenters::NewIssue.new(issue)
       end
     end
   end
diff --git a/lib/gitlab/chat_commands/presenters/access.rb b/lib/gitlab/chat_commands/presenters/access.rb
index 6d18d745608..b66ef48d6a8 100644
--- a/lib/gitlab/chat_commands/presenters/access.rb
+++ b/lib/gitlab/chat_commands/presenters/access.rb
@@ -1,22 +1,26 @@
-module Gitlab::ChatCommands::Presenters
-  class Access < Gitlab::ChatCommands::Presenters::Base
-    def access_denied
-      ephemeral_response(text: "Whoops! This action is not allowed. This incident will be [reported](https://xkcd.com/838/).")
-    end
-
-    def not_found
-      ephemeral_response(text: "404 not found! GitLab couldn't find what you were looking for! :boom:")
-    end
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class Access < Presenters::Base
+        def access_denied
+          ephemeral_response(text: "Whoops! This action is not allowed. This incident will be [reported](https://xkcd.com/838/).")
+        end
 
-    def authorize
-      message =
-        if @resource
-          ":wave: Hi there! Before I do anything for you, please [connect your GitLab account](#{@resource})."
-        else
-          ":sweat_smile: Couldn't identify you, nor can I autorize you!"
+        def not_found
+          ephemeral_response(text: "404 not found! GitLab couldn't find what you were looking for! :boom:")
         end
 
-      ephemeral_response(text: message)
+        def authorize
+          message =
+            if @resource
+              ":wave: Hi there! Before I do anything for you, please [connect your GitLab account](#{@resource})."
+            else
+              ":sweat_smile: Couldn't identify you, nor can I autorize you!"
+            end
+
+          ephemeral_response(text: message)
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/presenters/base.rb b/lib/gitlab/chat_commands/presenters/base.rb
index 0897025d85f..2700a5a2ad5 100644
--- a/lib/gitlab/chat_commands/presenters/base.rb
+++ b/lib/gitlab/chat_commands/presenters/base.rb
@@ -1,73 +1,77 @@
-module Gitlab::ChatCommands::Presenters
-  class Base
-    include Gitlab::Routing.url_helpers
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class Base
+        include Gitlab::Routing.url_helpers
+
+        def initialize(resource = nil)
+          @resource = resource
+        end
 
-    def initialize(resource = nil)
-      @resource = resource
-    end
+        def display_errors
+          message = header_with_list("The action was not successful, because:", @resource.errors.full_messages)
 
-    def display_errors
-      message = header_with_list("The action was not successful, because:", @resource.errors.full_messages)
+          ephemeral_response(text: message)
+        end
 
-      ephemeral_response(text: message)
-    end
+        private
 
-    private
+        def header_with_list(header, items)
+          message = [header]
 
-    def header_with_list(header, items)
-      message = [header]
+          items.each do |item|
+            message << "- #{item}"
+          end
 
-      items.each do |item|
-        message << "- #{item}"
-      end
+          message.join("\n")
+        end
 
-      message.join("\n")
-    end
+        def ephemeral_response(message)
+          response = {
+            response_type: :ephemeral,
+            status: 200
+          }.merge(message)
 
-    def ephemeral_response(message)
-      response = {
-        response_type: :ephemeral,
-        status: 200
-      }.merge(message)
+          format_response(response)
+        end
 
-      format_response(response)
-    end
+        def in_channel_response(message)
+          response = {
+            response_type: :in_channel,
+            status: 200
+          }.merge(message)
 
-    def in_channel_response(message)
-      response = {
-        response_type: :in_channel,
-        status: 200
-      }.merge(message)
+          format_response(response)
+        end
 
-      format_response(response)
-    end
+        def format_response(response)
+          response[:text] = format(response[:text]) if response.has_key?(:text)
 
-    def format_response(response)
-      response[:text] = format(response[:text]) if response.has_key?(:text)
+          if response.has_key?(:attachments)
+            response[:attachments].each do |attachment|
+              attachment[:pretext] = format(attachment[:pretext]) if attachment[:pretext]
+              attachment[:text] = format(attachment[:text]) if attachment[:text]
+            end
+          end
 
-      if response.has_key?(:attachments)
-        response[:attachments].each do |attachment|
-          attachment[:pretext] = format(attachment[:pretext]) if attachment[:pretext]
-          attachment[:text] = format(attachment[:text]) if attachment[:text]
+          response
         end
-      end
-
-      response
-    end
 
-    # Convert Markdown to slacks format
-    def format(string)
-      Slack::Notifier::LinkFormatter.format(string)
-    end
+        # Convert Markdown to slacks format
+        def format(string)
+          Slack::Notifier::LinkFormatter.format(string)
+        end
 
-    def resource_url
-      url_for(
-        [
-          @resource.project.namespace.becomes(Namespace),
-          @resource.project,
-          @resource
-        ]
-      )
+        def resource_url
+          url_for(
+            [
+              @resource.project.namespace.becomes(Namespace),
+              @resource.project,
+              @resource
+            ]
+          )
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/presenters/deploy.rb b/lib/gitlab/chat_commands/presenters/deploy.rb
index 4f6333812ff..b1cfaac15af 100644
--- a/lib/gitlab/chat_commands/presenters/deploy.rb
+++ b/lib/gitlab/chat_commands/presenters/deploy.rb
@@ -1,24 +1,29 @@
-module Gitlab::ChatCommands::Presenters
-  class Deploy < Gitlab::ChatCommands::Presenters::Base
-    def present(from, to)
-      message = "Deployment started from #{from} to #{to}. [Follow its progress](#{resource_url})."
-      in_channel_response(text: message)
-    end
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class Deploy < Presenters::Base
+        def present(from, to)
+          message = "Deployment started from #{from} to #{to}. [Follow its progress](#{resource_url})."
 
-    def no_actions
-      ephemeral_response(text: "No action found to be executed")
-    end
+          in_channel_response(text: message)
+        end
 
-    def too_many_actions
-      ephemeral_response(text: "Too many actions defined")
-    end
+        def no_actions
+          ephemeral_response(text: "No action found to be executed")
+        end
+
+        def too_many_actions
+          ephemeral_response(text: "Too many actions defined")
+        end
 
-    private
+        private
 
-    def resource_url
-      polymorphic_url(
-        [ @resource.project.namespace.becomes(Namespace), @resource.project, @resource]
-      )
+        def resource_url
+          polymorphic_url(
+            [ @resource.project.namespace.becomes(Namespace), @resource.project, @resource]
+          )
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/presenters/help.rb b/lib/gitlab/chat_commands/presenters/help.rb
index 133b707231f..c7a67467b7e 100644
--- a/lib/gitlab/chat_commands/presenters/help.rb
+++ b/lib/gitlab/chat_commands/presenters/help.rb
@@ -1,20 +1,25 @@
-module Gitlab::ChatCommands::Presenters
-  class Help < Gitlab::ChatCommands::Presenters::Base
-    def present(trigger)
-      message =
-        if @resource.none?
-          "No commands available :thinking_face:"
-        else
-          header_with_list("Available commands", full_commands(trigger))
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class Help < Presenters::Base
+        def present(trigger)
+          ephemeral_response(text: help_message(trigger))
         end
 
-      ephemeral_response(text: message)
-    end
+        private
 
-    private
+        def help_message(trigger)
+          if @resource.none?
+            "No commands available :thinking_face:"
+          else
+            header_with_list("Available commands", full_commands(trigger))
+          end
+        end
 
-    def full_commands(trigger)
-      @resource.map { |command| "#{trigger} #{command.help_message}" }
+        def full_commands(trigger)
+          @resource.map { |command| "#{trigger} #{command.help_message}" }
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/presenters/issuable.rb b/lib/gitlab/chat_commands/presenters/issuable.rb
index 9623387f188..2cb6b1525fc 100644
--- a/lib/gitlab/chat_commands/presenters/issuable.rb
+++ b/lib/gitlab/chat_commands/presenters/issuable.rb
@@ -1,33 +1,45 @@
-module Gitlab::ChatCommands::Presenters
-  class Issuable < Gitlab::ChatCommands::Presenters::Base
-    private
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class Issuable < Presenters::Base
+        private
 
-    def project
-      @resource.project
-    end
+        def color(issuable)
+          issuable.open? ? '#38ae67' : '#d22852'
+        end
 
-    def author
-      @resource.author
-    end
+        def status_text(issuable)
+          issuable.open? ? 'Open' : 'Closed'
+        end
+
+        def project
+          @resource.project
+        end
+
+        def author
+          @resource.author
+        end
 
-    def fields
-      [
-        {
-          title: "Assignee",
-          value: @resource.assignee ? @resource.assignee.name : "_None_",
-          short: true
-        },
-        {
-          title: "Milestone",
-          value: @resource.milestone ? @resource.milestone.title : "_None_",
-          short: true
-        },
-        {
-          title: "Labels",
-          value: @resource.labels.any? ? @resource.label_names : "_None_",
-          short: true
-        }
-      ]
+        def fields
+          [
+            {
+              title: "Assignee",
+              value: @resource.assignee ? @resource.assignee.name : "_None_",
+              short: true
+            },
+            {
+              title: "Milestone",
+              value: @resource.milestone ? @resource.milestone.title : "_None_",
+              short: true
+            },
+            {
+              title: "Labels",
+              value: @resource.labels.any? ? @resource.label_names : "_None_",
+              short: true
+            }
+          ]
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/presenters/list_issues.rb b/lib/gitlab/chat_commands/presenters/list_issues.rb
index 5a7b3fca5c2..2458b9356b7 100644
--- a/lib/gitlab/chat_commands/presenters/list_issues.rb
+++ b/lib/gitlab/chat_commands/presenters/list_issues.rb
@@ -1,32 +1,43 @@
-module Gitlab::ChatCommands::Presenters
-  class ListIssues < Gitlab::ChatCommands::Presenters::Base
-    def present
-      ephemeral_response(text: "Here are the issues I found:", attachments: attachments)
-    end
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class ListIssues < Presenters::Issuable
+        def present
+          text = if @resource.count >= 5
+                   "Here are the first 5 issues I found:"
+                 else
+                   "Here are the #{@resource.count} issues I found:"
+                 end
 
-    private
+          ephemeral_response(text: text, attachments: attachments)
+        end
 
-    def attachments
-      @resource.map do |issue|
-        state = issue.open? ? "Open" : "Closed"
+        private
 
-        {
-          fallback: "Issue #{issue.to_reference}: #{issue.title}",
-          color: "#d22852",
-          text: "[#{issue.to_reference}](#{url_for([namespace, project, issue])}) · #{issue.title} (#{state})",
-          mrkdwn_in: [
-            "text"
-          ]
-        }
-      end
-    end
+        def attachments
+          @resource.map do |issue|
+            url = "[#{issue.to_reference}](#{url_for([namespace, project, issue])})"
 
-    def project
-      @project ||= @resource.first.project
-    end
+            {
+              color: color(issue),
+              fallback: "#{issue.to_reference} #{issue.title}",
+              text: "#{url} · #{issue.title} (#{status_text(issue)})",
 
-    def namespace
-      @namespace ||= project.namespace.becomes(Namespace)
+              mrkdwn_in: [
+                "text"
+              ]
+            }
+          end
+        end
+
+        def project
+          @project ||= @resource.first.project
+        end
+
+        def namespace
+          @namespace ||= project.namespace.becomes(Namespace)
+        end
+      end
     end
   end
 end
diff --git a/lib/gitlab/chat_commands/presenters/new_issue.rb b/lib/gitlab/chat_commands/presenters/new_issue.rb
new file mode 100644
index 00000000000..c7c6febb56e
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/new_issue.rb
@@ -0,0 +1,42 @@
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class NewIssue < Presenters::Issuable
+        def present
+          in_channel_response(show_issue)
+        end
+
+        private
+
+        def show_issue
+          {
+            attachments: [
+              {
+                title:        "#{@resource.title} · #{@resource.to_reference}",
+                title_link:   resource_url,
+                author_name:  author.name,
+                author_icon:  author.avatar_url,
+                fallback:     "New issue #{@resource.to_reference}: #{@resource.title}",
+                pretext:      pretext,
+                color:        color(@resource),
+                fields:       fields,
+                mrkdwn_in: [
+                  :title,
+                  :text
+                ]
+              }
+            ]
+          }
+        end
+
+        def pretext
+          "I opened an issue on behalf on #{author_profile_link}: *#{@resource.to_reference}* from #{project.name_with_namespace}"
+        end
+
+        def author_profile_link
+          "[#{author.to_reference}](#{url_for(author)})"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/show_issue.rb b/lib/gitlab/chat_commands/presenters/show_issue.rb
index 2a89c30b972..e5644a4ad7e 100644
--- a/lib/gitlab/chat_commands/presenters/show_issue.rb
+++ b/lib/gitlab/chat_commands/presenters/show_issue.rb
@@ -1,38 +1,54 @@
-module Gitlab::ChatCommands::Presenters
-  class ShowIssue < Gitlab::ChatCommands::Presenters::Issuable
-    def present
-      in_channel_response(show_issue)
-    end
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class ShowIssue < Presenters::Issuable
+        def present
+          in_channel_response(show_issue)
+        end
 
-    private
+        private
 
-    def show_issue
-      {
-        attachments: [
+        def show_issue
           {
-            title:        @resource.title,
-            title_link:   resource_url,
-            author_name:  author.name,
-            author_icon:  author.avatar_url,
-            fallback:     "#{@resource.to_reference}: #{@resource.title}",
-            text:         text,
-            fields:       fields,
-            mrkdwn_in: [
-              :title,
-              :text
+            attachments: [
+              {
+                title:        "#{@resource.title} · #{@resource.to_reference}",
+                title_link:   resource_url,
+                author_name:  author.name,
+                author_icon:  author.avatar_url,
+                fallback:     "New issue #{@resource.to_reference}: #{@resource.title}",
+                pretext:      pretext,
+                text:         text,
+                color:        color(@resource),
+                fields:       fields,
+                mrkdwn_in: [
+                  :pretext,
+                  :text
+                ]
+              }
             ]
           }
-        ]
-      }
-    end
+        end
+
+        def text
+          message = "**#{status_text(@resource)}**"
+
+          if @resource.upvotes.zero? && @resource.downvotes.zero? && @resource.user_notes_count.zero?
+            return message
+          end
+
+          message << " · "
+          message << ":+1: #{@resource.upvotes} " unless @resource.upvotes.zero?
+          message << ":-1: #{@resource.downvotes} " unless @resource.downvotes.zero?
+          message << ":speech_balloon: #{@resource.user_notes_count}" unless @resource.user_notes_count.zero?
 
-    def text
-      message = ""
-      message << ":+1: #{@resource.upvotes} " unless @resource.upvotes.zero?
-      message << ":-1: #{@resource.downvotes} " unless @resource.downvotes.zero?
-      message << ":speech_balloon: #{@resource.user_notes_count}" unless @resource.user_notes_count.zero?
+          message
+        end
 
-      message
+        def pretext
+          "Issue *#{@resource.to_reference} from #{project.name_with_namespace}"
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 5ec214b0a5d9d3f0f0418a0e14ebf30b60a14a12 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Thu, 26 Jan 2017 15:30:34 +0100
Subject: Rename presenters for consitency

---
 lib/gitlab/chat_commands/command.rb                |  2 +-
 lib/gitlab/chat_commands/issue_create.rb           | 42 ----------------
 lib/gitlab/chat_commands/issue_new.rb              | 42 ++++++++++++++++
 lib/gitlab/chat_commands/issue_search.rb           |  8 ++--
 lib/gitlab/chat_commands/issue_show.rb             |  2 +-
 lib/gitlab/chat_commands/presenters/deploy.rb      |  8 ----
 lib/gitlab/chat_commands/presenters/help.rb        |  6 +--
 lib/gitlab/chat_commands/presenters/issuable.rb    |  4 +-
 lib/gitlab/chat_commands/presenters/issue_new.rb   | 48 +++++++++++++++++++
 .../chat_commands/presenters/issue_search.rb       | 45 +++++++++++++++++
 lib/gitlab/chat_commands/presenters/issue_show.rb  | 56 ++++++++++++++++++++++
 lib/gitlab/chat_commands/presenters/list_issues.rb | 43 -----------------
 lib/gitlab/chat_commands/presenters/new_issue.rb   | 42 ----------------
 lib/gitlab/chat_commands/presenters/show_issue.rb  | 54 ---------------------
 lib/mattermost/command.rb                          |  4 --
 15 files changed, 200 insertions(+), 206 deletions(-)
 delete mode 100644 lib/gitlab/chat_commands/issue_create.rb
 create mode 100644 lib/gitlab/chat_commands/issue_new.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/issue_new.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/issue_search.rb
 create mode 100644 lib/gitlab/chat_commands/presenters/issue_show.rb
 delete mode 100644 lib/gitlab/chat_commands/presenters/list_issues.rb
 delete mode 100644 lib/gitlab/chat_commands/presenters/new_issue.rb
 delete mode 100644 lib/gitlab/chat_commands/presenters/show_issue.rb

(limited to 'lib')

diff --git a/lib/gitlab/chat_commands/command.rb b/lib/gitlab/chat_commands/command.rb
index 4e5031a8a26..e7baa20356c 100644
--- a/lib/gitlab/chat_commands/command.rb
+++ b/lib/gitlab/chat_commands/command.rb
@@ -3,7 +3,7 @@ module Gitlab
     class Command < BaseCommand
       COMMANDS = [
         Gitlab::ChatCommands::IssueShow,
-        Gitlab::ChatCommands::IssueCreate,
+        Gitlab::ChatCommands::IssueNew,
         Gitlab::ChatCommands::IssueSearch,
         Gitlab::ChatCommands::Deploy,
       ].freeze
diff --git a/lib/gitlab/chat_commands/issue_create.rb b/lib/gitlab/chat_commands/issue_create.rb
deleted file mode 100644
index 3f3d7de8b2e..00000000000
--- a/lib/gitlab/chat_commands/issue_create.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-module Gitlab
-  module ChatCommands
-    class IssueCreate < IssueCommand
-      def self.match(text)
-        # we can not match \n with the dot by passing the m modifier as than
-        # the title and description are not seperated
-        /\Aissue\s+(new|create)\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/.match(text)
-      end
-
-      def self.help_message
-        'issue new <title> *`⇧ Shift`*+*`↵ Enter`* <description>'
-      end
-
-      def self.allowed?(project, user)
-        can?(user, :create_issue, project)
-      end
-
-      def execute(match)
-        title = match[:title]
-        description = match[:description].to_s.rstrip
-
-        issue = create_issue(title: title, description: description)
-
-        if issue.errors.any?
-          presenter(issue).display_errors
-        else
-          presenter(issue).present
-        end
-      end
-
-      private
-
-      def create_issue(title:, description:)
-        Issues::CreateService.new(project, current_user, title: title, description: description).execute
-      end
-
-      def presenter(issue)
-        Gitlab::ChatCommands::Presenters::NewIssue.new(issue)
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/chat_commands/issue_new.rb b/lib/gitlab/chat_commands/issue_new.rb
new file mode 100644
index 00000000000..016054ecd46
--- /dev/null
+++ b/lib/gitlab/chat_commands/issue_new.rb
@@ -0,0 +1,42 @@
+module Gitlab
+  module ChatCommands
+    class IssueNew < IssueCommand
+      def self.match(text)
+        # we can not match \n with the dot by passing the m modifier as than
+        # the title and description are not seperated
+        /\Aissue\s+(new|create)\s+(?<title>[^\n]*)\n*(?<description>(.|\n)*)/.match(text)
+      end
+
+      def self.help_message
+        'issue new <title> *`⇧ Shift`*+*`↵ Enter`* <description>'
+      end
+
+      def self.allowed?(project, user)
+        can?(user, :create_issue, project)
+      end
+
+      def execute(match)
+        title = match[:title]
+        description = match[:description].to_s.rstrip
+
+        issue = create_issue(title: title, description: description)
+
+        if issue.persisted?
+          presenter(issue).present
+        else
+          presenter(issue).display_errors
+        end
+      end
+
+      private
+
+      def create_issue(title:, description:)
+        Issues::CreateService.new(project, current_user, title: title, description: description).execute
+      end
+
+      def presenter(issue)
+        Gitlab::ChatCommands::Presenters::IssueNew.new(issue)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/issue_search.rb b/lib/gitlab/chat_commands/issue_search.rb
index e2d3a0f466a..3491b53093e 100644
--- a/lib/gitlab/chat_commands/issue_search.rb
+++ b/lib/gitlab/chat_commands/issue_search.rb
@@ -12,12 +12,10 @@ module Gitlab
       def execute(match)
         issues = collection.search(match[:query]).limit(QUERY_LIMIT)
 
-        if issues.none?
-          Presenters::Access.new(issues).not_found
-        elsif issues.one?
-          Presenters::ShowIssue.new(issues.first).present
+        if issues.present?
+          Presenters::IssueSearch.new(issues).present
         else
-          Presenters::ListIssues.new(issues).present
+          Presenters::Access.new(issues).not_found
         end
       end
     end
diff --git a/lib/gitlab/chat_commands/issue_show.rb b/lib/gitlab/chat_commands/issue_show.rb
index 9f3e1b9a64b..d6013f4d10c 100644
--- a/lib/gitlab/chat_commands/issue_show.rb
+++ b/lib/gitlab/chat_commands/issue_show.rb
@@ -13,7 +13,7 @@ module Gitlab
         issue = find_by_iid(match[:iid])
 
         if issue
-          Gitlab::ChatCommands::Presenters::ShowIssue.new(issue).present
+          Gitlab::ChatCommands::Presenters::IssueShow.new(issue).present
         else
           Gitlab::ChatCommands::Presenters::Access.new.not_found
         end
diff --git a/lib/gitlab/chat_commands/presenters/deploy.rb b/lib/gitlab/chat_commands/presenters/deploy.rb
index b1cfaac15af..863d0bf99ca 100644
--- a/lib/gitlab/chat_commands/presenters/deploy.rb
+++ b/lib/gitlab/chat_commands/presenters/deploy.rb
@@ -15,14 +15,6 @@ module Gitlab
         def too_many_actions
           ephemeral_response(text: "Too many actions defined")
         end
-
-        private
-
-        def resource_url
-          polymorphic_url(
-            [ @resource.project.namespace.becomes(Namespace), @resource.project, @resource]
-          )
-        end
       end
     end
   end
diff --git a/lib/gitlab/chat_commands/presenters/help.rb b/lib/gitlab/chat_commands/presenters/help.rb
index c7a67467b7e..39ad3249f5b 100644
--- a/lib/gitlab/chat_commands/presenters/help.rb
+++ b/lib/gitlab/chat_commands/presenters/help.rb
@@ -9,10 +9,10 @@ module Gitlab
         private
 
         def help_message(trigger)
-          if @resource.none?
-            "No commands available :thinking_face:"
-          else
+          if @resource.present?
             header_with_list("Available commands", full_commands(trigger))
+          else
+            "No commands available :thinking_face:"
           end
         end
 
diff --git a/lib/gitlab/chat_commands/presenters/issuable.rb b/lib/gitlab/chat_commands/presenters/issuable.rb
index 2cb6b1525fc..dfb1c8f6616 100644
--- a/lib/gitlab/chat_commands/presenters/issuable.rb
+++ b/lib/gitlab/chat_commands/presenters/issuable.rb
@@ -1,9 +1,7 @@
 module Gitlab
   module ChatCommands
     module Presenters
-      class Issuable < Presenters::Base
-        private
-
+      module Issuable
         def color(issuable)
           issuable.open? ? '#38ae67' : '#d22852'
         end
diff --git a/lib/gitlab/chat_commands/presenters/issue_new.rb b/lib/gitlab/chat_commands/presenters/issue_new.rb
new file mode 100644
index 00000000000..d26dd22b2a0
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/issue_new.rb
@@ -0,0 +1,48 @@
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class IssueNew < Presenters::Base
+        include Presenters::Issuable
+
+        def present
+          in_channel_response(new_issue)
+        end
+
+        private
+
+        def new_issue 
+          {
+            attachments: [
+              {
+                title:        "#{@resource.title} · #{@resource.to_reference}",
+                title_link:   resource_url,
+                author_name:  author.name,
+                author_icon:  author.avatar_url,
+                fallback:     "New issue #{@resource.to_reference}: #{@resource.title}",
+                pretext:      pretext,
+                color:        color(@resource),
+                fields:       fields,
+                mrkdwn_in: [
+                  :title,
+                  :text
+                ]
+              }
+            ]
+          }
+        end
+
+        def pretext
+          "I opened an issue on behalf on #{author_profile_link}: *#{@resource.to_reference}* from #{project.name_with_namespace}"
+        end
+
+        def project_link
+          "[#{project.name_with_namespace}](#{url_for(project)})"
+        end
+
+        def author_profile_link
+          "[#{author.to_reference}](#{url_for(author)})"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/issue_search.rb b/lib/gitlab/chat_commands/presenters/issue_search.rb
new file mode 100644
index 00000000000..d58a6d6114a
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/issue_search.rb
@@ -0,0 +1,45 @@
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class IssueSearch < Presenters::Base
+        include Presenters::Issuable
+
+        def present
+          text = if @resource.count >= 5
+                   "Here are the first 5 issues I found:"
+                 else
+                   "Here are the #{@resource.count} issues I found:"
+                 end
+
+          ephemeral_response(text: text, attachments: attachments)
+        end
+
+        private
+
+        def attachments
+          @resource.map do |issue|
+            url = "[#{issue.to_reference}](#{url_for([namespace, project, issue])})"
+
+            {
+              color: color(issue),
+              fallback: "#{issue.to_reference} #{issue.title}",
+              text: "#{url} · #{issue.title} (#{status_text(issue)})",
+
+              mrkdwn_in: [
+                "text"
+              ]
+            }
+          end
+        end
+
+        def project
+          @project ||= @resource.first.project
+        end
+
+        def namespace
+          @namespace ||= project.namespace.becomes(Namespace)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/issue_show.rb b/lib/gitlab/chat_commands/presenters/issue_show.rb
new file mode 100644
index 00000000000..2fc671f13a6
--- /dev/null
+++ b/lib/gitlab/chat_commands/presenters/issue_show.rb
@@ -0,0 +1,56 @@
+module Gitlab
+  module ChatCommands
+    module Presenters
+      class IssueShow < Presenters::Base
+        include Presenters::Issuable
+
+        def present
+          in_channel_response(show_issue)
+        end
+
+        private
+
+        def show_issue
+          {
+            attachments: [
+              {
+                title:        "#{@resource.title} · #{@resource.to_reference}",
+                title_link:   resource_url,
+                author_name:  author.name,
+                author_icon:  author.avatar_url,
+                fallback:     "Issue #{@resource.to_reference}: #{@resource.title}",
+                pretext:      pretext,
+                text:         text,
+                color:        color(@resource),
+                fields:       fields,
+                mrkdwn_in: [
+                  :pretext,
+                  :text
+                ]
+              }
+            ]
+          }
+        end
+
+        def text
+          message = "**#{status_text(@resource)}**"
+
+          if @resource.upvotes.zero? && @resource.downvotes.zero? && @resource.user_notes_count.zero?
+            return message
+          end
+
+          message << " · "
+          message << ":+1: #{@resource.upvotes} " unless @resource.upvotes.zero?
+          message << ":-1: #{@resource.downvotes} " unless @resource.downvotes.zero?
+          message << ":speech_balloon: #{@resource.user_notes_count}" unless @resource.user_notes_count.zero?
+
+          message
+        end
+
+        def pretext
+          "Issue *#{@resource.to_reference} from #{project.name_with_namespace}"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/chat_commands/presenters/list_issues.rb b/lib/gitlab/chat_commands/presenters/list_issues.rb
deleted file mode 100644
index 2458b9356b7..00000000000
--- a/lib/gitlab/chat_commands/presenters/list_issues.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-module Gitlab
-  module ChatCommands
-    module Presenters
-      class ListIssues < Presenters::Issuable
-        def present
-          text = if @resource.count >= 5
-                   "Here are the first 5 issues I found:"
-                 else
-                   "Here are the #{@resource.count} issues I found:"
-                 end
-
-          ephemeral_response(text: text, attachments: attachments)
-        end
-
-        private
-
-        def attachments
-          @resource.map do |issue|
-            url = "[#{issue.to_reference}](#{url_for([namespace, project, issue])})"
-
-            {
-              color: color(issue),
-              fallback: "#{issue.to_reference} #{issue.title}",
-              text: "#{url} · #{issue.title} (#{status_text(issue)})",
-
-              mrkdwn_in: [
-                "text"
-              ]
-            }
-          end
-        end
-
-        def project
-          @project ||= @resource.first.project
-        end
-
-        def namespace
-          @namespace ||= project.namespace.becomes(Namespace)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/chat_commands/presenters/new_issue.rb b/lib/gitlab/chat_commands/presenters/new_issue.rb
deleted file mode 100644
index c7c6febb56e..00000000000
--- a/lib/gitlab/chat_commands/presenters/new_issue.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-module Gitlab
-  module ChatCommands
-    module Presenters
-      class NewIssue < Presenters::Issuable
-        def present
-          in_channel_response(show_issue)
-        end
-
-        private
-
-        def show_issue
-          {
-            attachments: [
-              {
-                title:        "#{@resource.title} · #{@resource.to_reference}",
-                title_link:   resource_url,
-                author_name:  author.name,
-                author_icon:  author.avatar_url,
-                fallback:     "New issue #{@resource.to_reference}: #{@resource.title}",
-                pretext:      pretext,
-                color:        color(@resource),
-                fields:       fields,
-                mrkdwn_in: [
-                  :title,
-                  :text
-                ]
-              }
-            ]
-          }
-        end
-
-        def pretext
-          "I opened an issue on behalf on #{author_profile_link}: *#{@resource.to_reference}* from #{project.name_with_namespace}"
-        end
-
-        def author_profile_link
-          "[#{author.to_reference}](#{url_for(author)})"
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/chat_commands/presenters/show_issue.rb b/lib/gitlab/chat_commands/presenters/show_issue.rb
deleted file mode 100644
index e5644a4ad7e..00000000000
--- a/lib/gitlab/chat_commands/presenters/show_issue.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-module Gitlab
-  module ChatCommands
-    module Presenters
-      class ShowIssue < Presenters::Issuable
-        def present
-          in_channel_response(show_issue)
-        end
-
-        private
-
-        def show_issue
-          {
-            attachments: [
-              {
-                title:        "#{@resource.title} · #{@resource.to_reference}",
-                title_link:   resource_url,
-                author_name:  author.name,
-                author_icon:  author.avatar_url,
-                fallback:     "New issue #{@resource.to_reference}: #{@resource.title}",
-                pretext:      pretext,
-                text:         text,
-                color:        color(@resource),
-                fields:       fields,
-                mrkdwn_in: [
-                  :pretext,
-                  :text
-                ]
-              }
-            ]
-          }
-        end
-
-        def text
-          message = "**#{status_text(@resource)}**"
-
-          if @resource.upvotes.zero? && @resource.downvotes.zero? && @resource.user_notes_count.zero?
-            return message
-          end
-
-          message << " · "
-          message << ":+1: #{@resource.upvotes} " unless @resource.upvotes.zero?
-          message << ":-1: #{@resource.downvotes} " unless @resource.downvotes.zero?
-          message << ":speech_balloon: #{@resource.user_notes_count}" unless @resource.user_notes_count.zero?
-
-          message
-        end
-
-        def pretext
-          "Issue *#{@resource.to_reference} from #{project.name_with_namespace}"
-        end
-      end
-    end
-  end
-end
diff --git a/lib/mattermost/command.rb b/lib/mattermost/command.rb
index 2e4f7705f86..33e450d7f0a 100644
--- a/lib/mattermost/command.rb
+++ b/lib/mattermost/command.rb
@@ -1,11 +1,7 @@
 module Mattermost
   class Command < Client
     def create(params)
-<<<<<<< HEAD
       response = session_post("/api/v3/teams/#{params[:team_id]}/commands/create",
-=======
-      response = json_post("/api/v3/teams/#{params[:team_id]}/commands/create",
->>>>>>> Revert removing of some files
         body: params.to_json)
 
       response['token']
-- 
cgit v1.2.1


From e589c7e84854bd181d5059200e80f0b5c0b0e5f8 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 24 Jan 2017 12:06:09 +0100
Subject: Ignore encrypted attributes in Import/Export

* Regenerates tokens for all models that have them
* Remove variables, since they are basically just storing encrypted data
* Bumped version up to 0.1.6
* Updated related docs
---
 lib/gitlab/import_export.rb                  |  2 +-
 lib/gitlab/import_export/import_export.yml   |  1 -
 lib/gitlab/import_export/relation_factory.rb | 15 ++++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index eb667a85b78..d679edec36b 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -3,7 +3,7 @@ module Gitlab
     extend self
 
     # For every version update, the version history in import_export.md has to be kept up to date.
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
     FILENAME_LIMIT = 50
 
     def export_path(relative_path:)
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 08ad3274b38..416194e57d7 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -39,7 +39,6 @@ project_tree:
       - :author
       - :events
     - :statuses
-  - :variables
   - :triggers
   - :deploy_keys
   - :services
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 19e43cce768..040a10011e2 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -4,7 +4,6 @@ module Gitlab
       OVERRIDES = { snippets: :project_snippets,
                     pipelines: 'Ci::Pipeline',
                     statuses: 'commit_status',
-                    variables: 'Ci::Variable',
                     triggers: 'Ci::Trigger',
                     builds: 'Ci::Build',
                     hooks: 'ProjectHook',
@@ -24,6 +23,8 @@ module Gitlab
 
       EXISTING_OBJECT_CHECK = %i[milestone milestones label labels project_label project_labels group_label group_labels].freeze
 
+      TOKEN_RESET_MODELS = %w[Ci::Trigger Ci::Build ProjectHook]
+
       def self.create(*args)
         new(*args).create
       end
@@ -61,7 +62,8 @@ module Gitlab
         update_project_references
 
         handle_group_label if group_label?
-        reset_ci_tokens if @relation_name == 'Ci::Trigger'
+        reset_ci_tokens!
+
         @relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data']
         set_st_diffs if @relation_name == :merge_request_diff
       end
@@ -140,11 +142,14 @@ module Gitlab
         end
       end
 
-      def reset_ci_tokens
-        return unless Gitlab::ImportExport.reset_tokens?
+      def reset_ci_tokens!
+        return unless Gitlab::ImportExport.reset_tokens? && TOKEN_RESET_MODELS.include?(@relation_name.to_s)
 
         # If we import/export a project to the same instance, tokens will have to be reset.
-        @relation_hash['token'] = nil
+        # We also have to reset them to avoid issues when the gitlab secrets file cannot be copied across.
+        relation_class.attribute_names.select { |name| name.include?('token') }.each do |token|
+          @relation_hash[token] = nil
+        end
       end
 
       def relation_class
-- 
cgit v1.2.1


From 6a2b976c66b17ec62575bfefda99221ccdc85e1e Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 24 Jan 2017 12:11:12 +0100
Subject: fix typo

---
 lib/gitlab/import_export/relation_factory.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 040a10011e2..8a44e78fb44 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -23,7 +23,7 @@ module Gitlab
 
       EXISTING_OBJECT_CHECK = %i[milestone milestones label labels project_label project_labels group_label group_labels].freeze
 
-      TOKEN_RESET_MODELS = %w[Ci::Trigger Ci::Build ProjectHook]
+      TOKEN_RESET_MODELS = %w[Ci::Trigger Ci::Build ProjectHook].freeze
 
       def self.create(*args)
         new(*args).create
-- 
cgit v1.2.1


From eeb13c16d1f627eba10313bf5c4662416392feb3 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 25 Jan 2017 10:17:50 +0100
Subject: rename method and added note to export file spec about new encrypted
 attributes

---
 lib/gitlab/import_export/relation_factory.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 8a44e78fb44..cb9f20a70a0 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -62,7 +62,7 @@ module Gitlab
         update_project_references
 
         handle_group_label if group_label?
-        reset_ci_tokens!
+        reset_tokens!
 
         @relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data']
         set_st_diffs if @relation_name == :merge_request_diff
@@ -142,7 +142,7 @@ module Gitlab
         end
       end
 
-      def reset_ci_tokens!
+      def reset_tokens!
         return unless Gitlab::ImportExport.reset_tokens? && TOKEN_RESET_MODELS.include?(@relation_name.to_s)
 
         # If we import/export a project to the same instance, tokens will have to be reset.
-- 
cgit v1.2.1


From 1a2d13c821179a2707790d9c0e4585044462cd42 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 30 Jan 2017 12:26:49 +0100
Subject: programmatically remove encrypted attributes. Added relevant spec.

---
 lib/gitlab/import_export/relation_factory.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index cb9f20a70a0..dd7f9e2fd65 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -63,6 +63,7 @@ module Gitlab
 
         handle_group_label if group_label?
         reset_tokens!
+        remove_encrypted_attributes!
 
         @relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data']
         set_st_diffs if @relation_name == :merge_request_diff
@@ -152,6 +153,14 @@ module Gitlab
         end
       end
 
+      def remove_encrypted_attributes!
+        return if relation_class.encrypted_attributes.empty?
+
+        relation_class.encrypted_attributes.each_key do |key|
+          @relation_hash[key.to_s] = nil
+        end
+      end
+
       def relation_class
         @relation_class ||= @relation_name.to_s.classify.constantize
       end
-- 
cgit v1.2.1


From 9bd424a3fd2829f92329f22365dd2f7105d67eb5 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Mon, 30 Jan 2017 12:29:55 +0100
Subject: Improve performance of triggered chat commands

When the trigger endpoint is called, it has to find the right service
for the given project. However, the old implementation did much more.

For example, it build a list of the missing services on this project.
This whole process took about 750ms _each time_. The current
implementation is expected to perform 10x better, as it only searches in
the current projects services. Given the service has to be configured
anyway, this can be done.
---
 lib/api/services.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/api/services.rb b/lib/api/services.rb
index a0abec49438..1456fe4688b 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -661,6 +661,14 @@ module API
     end
 
     trigger_services.each do |service_slug, settings|
+      helpers do
+        def chat_command_service(project, service_slug, params)
+          project.services.active.where(template: false).find do |service|
+            service.try(:token) == params[:token] && service.to_param == service_slug.underscore
+          end
+        end
+      end
+
       params do
         requires :id, type: String, desc: 'The ID of a project'
       end
@@ -679,9 +687,8 @@ module API
           # This is not accurate, but done to prevent leakage of the project names
           not_found!('Service') unless project
 
-          service = project.find_or_initialize_service(service_slug.underscore)
-
-          result = service.try(:active?) && service.try(:trigger, params)
+          service = chat_command_service(project, service_slug, params)
+          result = service.try(:trigger, params)
 
           if result
             status result[:status] || 200
-- 
cgit v1.2.1


From 017a5068f60c0a7fb058422c5d8d2740f36084a4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 30 Jan 2017 14:26:05 +0100
Subject: fix spec failure

---
 lib/gitlab/import_export/relation_factory.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index dd7f9e2fd65..0319d7707a8 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -154,7 +154,7 @@ module Gitlab
       end
 
       def remove_encrypted_attributes!
-        return if relation_class.encrypted_attributes.empty?
+        return unless relation_class.respond_to?(:encrypted_attributes) && relation_class.encrypted_attributes.any?
 
         relation_class.encrypted_attributes.each_key do |key|
           @relation_hash[key.to_s] = nil
-- 
cgit v1.2.1


From 15ad1d881582cc20145f5d0be69de84606576260 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 26 Jan 2017 21:31:32 +0200
Subject: Use full group name/path in UI dropdowns

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 lib/api/entities.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9f59939e9ae..a07b2a9ca0f 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -137,6 +137,7 @@ module API
       expose :avatar_url
       expose :web_url
       expose :request_access_enabled
+      expose :full_name, :full_path
 
       expose :statistics, if: :statistics do
         with_options format_with: -> (value) { value.to_i } do
-- 
cgit v1.2.1


From 29414ab0438583c7401e94a74a613497874b5e4e Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Tue, 24 Jan 2017 11:12:49 -0600
Subject: Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms

We accept half a dozen different authentication mechanisms for
Git over HTTP. Fairly high in the list we were checking user
password, which would also query LDAP. In the case of LFS,
OAuth tokens or personal access tokens, we were unnecessarily
hitting LDAP when the authentication will not succeed. This
was causing some LDAP/AD systems to lock the account. Now,
user password authentication is the last mechanism tried since
it's the most expensive.
---
 lib/gitlab/auth.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 8dda65c71ef..f638905a1e0 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -10,13 +10,16 @@ module Gitlab
       def find_for_git_client(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?
 
+        # `user_with_password_for_git` should be the last check
+        # because it's the most expensive, especially when LDAP
+        # is enabled.
         result =
           service_request_check(login, password, project) ||
           build_access_token_check(login, password) ||
-          user_with_password_for_git(login, password) ||
-          oauth_access_token_check(login, password) ||
           lfs_token_check(login, password) ||
+          oauth_access_token_check(login, password) ||
           personal_access_token_check(login, password) ||
+          user_with_password_for_git(login, password) ||
           Gitlab::Auth::Result.new
 
         rate_limit!(ip, success: result.success?, login: login)
@@ -143,7 +146,9 @@ module Gitlab
             read_authentication_abilities
           end
 
-        Result.new(actor, nil, token_handler.type, authentication_abilities) if Devise.secure_compare(token_handler.token, password)
+        if Devise.secure_compare(token_handler.token, password)
+          Gitlab::Auth::Result.new(actor, nil, token_handler.type, authentication_abilities)
+        end
       end
 
       def build_access_token_check(login, password)
-- 
cgit v1.2.1


From d7f298c177555a09ac06acc9ad037611f664cc9e Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Mon, 30 Jan 2017 12:12:57 +0100
Subject: Incorporate feedback

---
 lib/gitlab/chat_commands/command.rb                 |  2 +-
 lib/gitlab/chat_commands/help.rb                    |  4 ++--
 lib/gitlab/chat_commands/presenters/access.rb       | 14 ++++++++++++++
 lib/gitlab/chat_commands/presenters/help.rb         | 12 +++++++-----
 lib/gitlab/chat_commands/presenters/issue_new.rb    |  4 +++-
 lib/gitlab/chat_commands/presenters/issue_search.rb |  4 +++-
 lib/gitlab/chat_commands/presenters/issue_show.rb   | 11 ++++++++---
 7 files changed, 38 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/chat_commands/command.rb b/lib/gitlab/chat_commands/command.rb
index e7baa20356c..f34ed0f4cf2 100644
--- a/lib/gitlab/chat_commands/command.rb
+++ b/lib/gitlab/chat_commands/command.rb
@@ -18,7 +18,7 @@ module Gitlab
             Gitlab::ChatCommands::Presenters::Access.new.access_denied
           end
         else
-          Gitlab::ChatCommands::Help.new(project, current_user, params).execute(available_commands)
+          Gitlab::ChatCommands::Help.new(project, current_user, params).execute(available_commands, params[:text])
         end
       end
 
diff --git a/lib/gitlab/chat_commands/help.rb b/lib/gitlab/chat_commands/help.rb
index e76733f5445..6c0e4d304a4 100644
--- a/lib/gitlab/chat_commands/help.rb
+++ b/lib/gitlab/chat_commands/help.rb
@@ -16,8 +16,8 @@ module Gitlab
         true
       end
 
-      def execute(commands)
-        Gitlab::ChatCommands::Presenters::Help.new(commands).present(trigger)
+      def execute(commands, text)
+        Gitlab::ChatCommands::Presenters::Help.new(commands).present(trigger, text)
       end
 
       def trigger
diff --git a/lib/gitlab/chat_commands/presenters/access.rb b/lib/gitlab/chat_commands/presenters/access.rb
index b66ef48d6a8..92f4fa17f78 100644
--- a/lib/gitlab/chat_commands/presenters/access.rb
+++ b/lib/gitlab/chat_commands/presenters/access.rb
@@ -20,6 +20,20 @@ module Gitlab
 
           ephemeral_response(text: message)
         end
+
+        def unknown_command(commands)
+          ephemeral_response(text: help_message(trigger))
+        end
+
+        private
+
+        def help_message(trigger)
+          header_with_list("Command not found, these are the commands you can use", full_commands(trigger))
+        end
+
+        def full_commands(trigger)
+          @resource.map { |command| "#{trigger} #{command.help_message}" }
+        end
       end
     end
   end
diff --git a/lib/gitlab/chat_commands/presenters/help.rb b/lib/gitlab/chat_commands/presenters/help.rb
index 39ad3249f5b..cd47b7f4c6a 100644
--- a/lib/gitlab/chat_commands/presenters/help.rb
+++ b/lib/gitlab/chat_commands/presenters/help.rb
@@ -2,17 +2,19 @@ module Gitlab
   module ChatCommands
     module Presenters
       class Help < Presenters::Base
-        def present(trigger)
-          ephemeral_response(text: help_message(trigger))
+        def present(trigger, text)
+          ephemeral_response(text: help_message(trigger, text))
         end
 
         private
 
-        def help_message(trigger)
-          if @resource.present?
+        def help_message(trigger, text)
+          return "No commands available :thinking_face:" unless @resource.present?
+
+          if text.start_with?('help')
             header_with_list("Available commands", full_commands(trigger))
           else
-            "No commands available :thinking_face:"
+            header_with_list("Unknown command, these commands are available", full_commands(trigger)) 
           end
         end
 
diff --git a/lib/gitlab/chat_commands/presenters/issue_new.rb b/lib/gitlab/chat_commands/presenters/issue_new.rb
index d26dd22b2a0..6e88e0574a3 100644
--- a/lib/gitlab/chat_commands/presenters/issue_new.rb
+++ b/lib/gitlab/chat_commands/presenters/issue_new.rb
@@ -24,7 +24,9 @@ module Gitlab
                 fields:       fields,
                 mrkdwn_in: [
                   :title,
-                  :text
+                  :pretext,
+                  :text,
+                  :fields
                 ]
               }
             ]
diff --git a/lib/gitlab/chat_commands/presenters/issue_search.rb b/lib/gitlab/chat_commands/presenters/issue_search.rb
index d58a6d6114a..3478359b91d 100644
--- a/lib/gitlab/chat_commands/presenters/issue_search.rb
+++ b/lib/gitlab/chat_commands/presenters/issue_search.rb
@@ -7,6 +7,8 @@ module Gitlab
         def present
           text = if @resource.count >= 5
                    "Here are the first 5 issues I found:"
+                 elsif @resource.one?
+                   "Here is the only issue I found:"
                  else
                    "Here are the #{@resource.count} issues I found:"
                  end
@@ -26,7 +28,7 @@ module Gitlab
               text: "#{url} · #{issue.title} (#{status_text(issue)})",
 
               mrkdwn_in: [
-                "text"
+                :text
               ]
             }
           end
diff --git a/lib/gitlab/chat_commands/presenters/issue_show.rb b/lib/gitlab/chat_commands/presenters/issue_show.rb
index 2fc671f13a6..fe5847ccd15 100644
--- a/lib/gitlab/chat_commands/presenters/issue_show.rb
+++ b/lib/gitlab/chat_commands/presenters/issue_show.rb
@@ -5,7 +5,11 @@ module Gitlab
         include Presenters::Issuable
 
         def present
-          in_channel_response(show_issue)
+          if @resource.confidential?
+            ephemeral_response(show_issue)
+          else
+            in_channel_response(show_issue)
+          end
         end
 
         private
@@ -25,7 +29,8 @@ module Gitlab
                 fields:       fields,
                 mrkdwn_in: [
                   :pretext,
-                  :text
+                  :text,
+                  :fields
                 ]
               }
             ]
@@ -48,7 +53,7 @@ module Gitlab
         end
 
         def pretext
-          "Issue *#{@resource.to_reference} from #{project.name_with_namespace}"
+          "Issue *#{@resource.to_reference}* from #{project.name_with_namespace}"
         end
       end
     end
-- 
cgit v1.2.1


From 164eb3aa37cbcff2c5fbf582c3acdbaa3e6fee77 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 31 Jan 2017 12:00:43 +0100
Subject: Improve styling of the new issue message

---
 lib/gitlab/chat_commands/presenters/issue_new.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/chat_commands/presenters/issue_new.rb b/lib/gitlab/chat_commands/presenters/issue_new.rb
index 6e88e0574a3..a1a3add56c9 100644
--- a/lib/gitlab/chat_commands/presenters/issue_new.rb
+++ b/lib/gitlab/chat_commands/presenters/issue_new.rb
@@ -34,11 +34,11 @@ module Gitlab
         end
 
         def pretext
-          "I opened an issue on behalf on #{author_profile_link}: *#{@resource.to_reference}* from #{project.name_with_namespace}"
+          "I created an issue on #{author_profile_link}'s behalf: **#{@resource.to_reference}** in #{project_link}"
         end
 
         def project_link
-          "[#{project.name_with_namespace}](#{url_for(project)})"
+          "[#{project.name_with_namespace}](#{projects_url(project)})"
         end
 
         def author_profile_link
-- 
cgit v1.2.1


From 918eaba0c3898b5b81d2db1cd598fd3fecac9ef8 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 Jan 2017 16:32:26 +0100
Subject: remove old project members from project

---
 lib/gitlab/import_export/members_mapper.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb
index 2405b94db50..6189867dc9c 100644
--- a/lib/gitlab/import_export/members_mapper.rb
+++ b/lib/gitlab/import_export/members_mapper.rb
@@ -41,6 +41,10 @@ module Gitlab
       end
 
       def ensure_default_member!
+        @project.project_members.each do |member|
+          member.destroy
+        end
+
         ProjectMember.create!(user: @user, access_level: ProjectMember::MASTER, source_id: @project.id, importing: true)
       end
 
-- 
cgit v1.2.1


From 89a2438ab44862b34ba1030761c27b37059389ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 31 Jan 2017 17:37:31 +0100
Subject: Fix wrong call to ProjectCacheWorker.perform
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's either ProjectCacheWorker#perform or
ProjectCacheWorker.perform_async!

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/tasks/gitlab/import.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index a2eca74a3c8..036a9307ab5 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -63,7 +63,7 @@ namespace :gitlab do
 
             if project.persisted?
               puts " * Created #{project.name} (#{repo_path})".color(:green)
-              ProjectCacheWorker.perform(project.id)
+              ProjectCacheWorker.perform_async(project.id)
             else
               puts " * Failed trying to create #{project.name} (#{repo_path})".color(:red)
               puts "   Errors: #{project.errors.messages}".color(:red)
-- 
cgit v1.2.1


From 8ea1dafe83da0b018dcc413242194749afd0e05a Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 31 Jan 2017 19:20:35 +0100
Subject: use destroy_all

---
 lib/gitlab/import_export/members_mapper.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb
index 6189867dc9c..a09577ae48d 100644
--- a/lib/gitlab/import_export/members_mapper.rb
+++ b/lib/gitlab/import_export/members_mapper.rb
@@ -41,9 +41,7 @@ module Gitlab
       end
 
       def ensure_default_member!
-        @project.project_members.each do |member|
-          member.destroy
-        end
+        @project.project_members.destroy_all
 
         ProjectMember.create!(user: @user, access_level: ProjectMember::MASTER, source_id: @project.id, importing: true)
       end
-- 
cgit v1.2.1


From c63194ce6f952173649d7de4038aa96348e90565 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 1 Feb 2017 18:15:59 +0000
Subject: Check public snippets for spam

Apply the same spam checks to public snippets (either personal snippets
that are public, or public snippets on public projects) as to issues on
public projects.
---
 lib/api/project_snippets.rb | 2 +-
 lib/api/snippets.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/api/project_snippets.rb b/lib/api/project_snippets.rb
index 9d8c5b63685..dcc0c82ee27 100644
--- a/lib/api/project_snippets.rb
+++ b/lib/api/project_snippets.rb
@@ -58,7 +58,7 @@ module API
       end
       post ":id/snippets" do
         authorize! :create_project_snippet, user_project
-        snippet_params = declared_params
+        snippet_params = declared_params.merge(request: request, api: true)
         snippet_params[:content] = snippet_params.delete(:code)
 
         snippet = CreateSnippetService.new(user_project, current_user, snippet_params).execute
diff --git a/lib/api/snippets.rb b/lib/api/snippets.rb
index e096e636806..eb9ece49e7f 100644
--- a/lib/api/snippets.rb
+++ b/lib/api/snippets.rb
@@ -64,7 +64,7 @@ module API
                                     desc: 'The visibility level of the snippet'
       end
       post do
-        attrs = declared_params(include_missing: false)
+        attrs = declared_params(include_missing: false).merge(request: request, api: true)
         snippet = CreateSnippetService.new(nil, current_user, attrs).execute
 
         if snippet.persisted?
-- 
cgit v1.2.1