Merge branch 'allowed-urls'

Signed-off-by: Dmitriy Zaporozhets <[email protected]>

Conflicts:
	config/application.yml.example
	spec/support/stub_gitlab_calls.rb

Author: dzaporozhets

app/models/user_session.rb

@@ -24,7 +24,7 @@ def authenticate_by_token(auth_opts)
   def authenticate_via(options, &block)
     url = options.delete(:url)
 
-    return nil unless GitlabCi.config.allowed_gitlab_urls.include?(url)
+    return nil unless GitlabCi.config.gitlab_server_urls.include?(url)
 
     user = block.call(url, Network.new, options)
 

app/views/user_sessions/_form.html.haml

@@ -12,6 +12,6 @@
   %div
     = f.label :url, 'GitLab Server'
   %div
-    = f.select :url, GitlabCi.config.allowed_gitlab_urls.map {|url| [url, url] }, { placeholder: 'http://gitlab.company.com' }, class: 'form-control signin-select'
+    = f.select :url, GitlabCi.config.gitlab_server_urls.map {|url| [url, url] }, { placeholder: 'http://gitlab.company.com' }, class: 'form-control signin-select'
   %br
   = f.submit "Sign in", class: 'btn btn-lg btn-success btn-block'

config/application.yml.example

@@ -1,5 +1,5 @@
 defaults: &defaults
-  allowed_gitlab_urls: 
+  gitlab_server_urls:
     # Replace with your gitlab server url
     - 'https://gitlab.example.com/'
 
@@ -36,7 +36,7 @@ development:
 
 test:
   <<: *defaults
-  allowed_gitlab_urls: 
+  gitlab_server_urls:
     - 'http://demo.gitlab.com/'
 
 production:

config/application.yml.example.development

@@ -1,7 +1,7 @@
 development:
-  allowed_gitlab_urls:
+  gitlab_server_urls:
     - 'http://localhost:3000'
   gitlab_ci:
     host: localhost
-    port: 5000
+    port: 9000
     https: false

spec/requests/projects_spec.rb

@@ -3,7 +3,7 @@
 describe API::API do
   include ApiHelpers
 
-  let(:gitlab_url) { GitlabCi.config.allowed_gitlab_urls.first }
+  let(:gitlab_url) { GitlabCi.config.gitlab_server_urls.first }
   let(:auth_opts) {
     {
       :email => "[email protected]",

spec/requests/runners_spec.rb

@@ -9,7 +9,7 @@
   }
 
   describe "GET /runners" do
-    let(:gitlab_url) { GitlabCi.config.allowed_gitlab_urls.first }
+    let(:gitlab_url) { GitlabCi.config.gitlab_server_urls.first }
     let(:auth_opts) {
       {
         :email => "[email protected]",

spec/support/stub_gitlab_calls.rb

@@ -14,7 +14,7 @@ def stub_js_gitlab_calls
   private
 
   def gitlab_url
-    GitlabCi.config.allowed_gitlab_urls.first
+    GitlabCi.config.gitlab_server_urls.first
   end
 
   def stub_session