Commit 60f0764e authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-23

# Conflicts:
#	app/assets/javascripts/pipelines/components/graph/graph_component.vue
#	app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
#	lib/gitlab.rb
#	lib/settings.rb
#	spec/spec_helper.rb
#	spec/support/helpers/stub_configuration.rb

[ci skip]
parents 048d388f 1f062ee0
...@@ -26,7 +26,9 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._ ...@@ -26,7 +26,9 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
- [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc) - [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc)
- [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc) - [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc)
- [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc) - [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc)
- [Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#priority-labels-deliverable-stretch-next-patch-release) - [Milestone labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#milestone-labels-deliverable-stretch-next-patch-release)
- [Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#bug-priority-labels-p1-p2-p3-etc)
- [Severity labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#bug-severity-labels-s1-s2-s3-etc)
- [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests) - [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests)
- [Implement design & UI elements](#implement-design-ui-elements) - [Implement design & UI elements](#implement-design-ui-elements)
- [Issue tracker](#issue-tracker) - [Issue tracker](#issue-tracker)
...@@ -128,6 +130,8 @@ Most issues will have labels for at least one of the following: ...@@ -128,6 +130,8 @@ Most issues will have labels for at least one of the following:
- Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc. - Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc.
- Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc. - Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.
- Milestone: ~Deliverable, ~Stretch, ~"Next Patch Release" - Milestone: ~Deliverable, ~Stretch, ~"Next Patch Release"
- Priority: ~P1, ~P2, ~P3, ~P4
- Severity: ~S1, ~S2, ~S3, ~S4
All labels, their meaning and priority are defined on the All labels, their meaning and priority are defined on the
[labels page][labels-page]. [labels page][labels-page].
...@@ -211,7 +215,7 @@ This label documents the planned timeline & urgency which is used to measure aga ...@@ -211,7 +215,7 @@ This label documents the planned timeline & urgency which is used to measure aga
| Label | Meaning | Estimate time to fix | Guidance | | Label | Meaning | Estimate time to fix | Guidance |
|-------|-----------------|------------------------------------------------------------------|----------| |-------|-----------------|------------------------------------------------------------------|----------|
| ~P1 | Urgent Priority | The current release | | | ~P1 | Urgent Priority | The current release + potentially immediate hotfix to GitLab.com | |
| ~P2 | High Priority | The next release | | | ~P2 | High Priority | The next release | |
| ~P3 | Medium Priority | Within the next 3 releases (approx one quarter) | | | ~P3 | Medium Priority | Within the next 3 releases (approx one quarter) | |
| ~P4 | Low Priority | Anything outside the next 3 releases (approx beyond one quarter) | The issue is prominent but does not impact user workflow and a workaround is documented | | ~P4 | Low Priority | Anything outside the next 3 releases (approx beyond one quarter) | The issue is prominent but does not impact user workflow and a workaround is documented |
......
...@@ -106,7 +106,10 @@ export default { ...@@ -106,7 +106,10 @@ export default {
:stage-connector-class="stageConnectorClass(index, stage)" :stage-connector-class="stageConnectorClass(index, stage)"
:is-first-column="isFirstColumn(index)" :is-first-column="isFirstColumn(index)"
:request-finished-for="requestFinishedFor" :request-finished-for="requestFinishedFor"
<<<<<<< HEAD
:has-triggered-by="hasTriggeredBy" :has-triggered-by="hasTriggeredBy"
=======
>>>>>>> upstream/master
/> />
</ul> </ul>
......
...@@ -34,10 +34,13 @@ export default { ...@@ -34,10 +34,13 @@ export default {
type: String, type: String,
required: false, required: false,
default: '', default: '',
<<<<<<< HEAD
}, },
hasTriggeredBy: { hasTriggeredBy: {
type: Boolean, type: Boolean,
required: true, required: true,
=======
>>>>>>> upstream/master
}, },
}, },
......
...@@ -23,7 +23,7 @@ You can create as many deploy tokens as you like from the settings of your proje ...@@ -23,7 +23,7 @@ You can create as many deploy tokens as you like from the settings of your proje
![Personal access tokens page](img/deploy_tokens.png) ![Personal access tokens page](img/deploy_tokens.png)
## Revoking a personal access token ## Revoking a deploy token
At any time, you can revoke any deploy token by just clicking the At any time, you can revoke any deploy token by just clicking the
respective **Revoke** button under the 'Active deploy tokens' area. respective **Revoke** button under the 'Active deploy tokens' area.
......
...@@ -13,8 +13,11 @@ module Gitlab ...@@ -13,8 +13,11 @@ module Gitlab
COM_URL = 'https://gitlab.com'.freeze COM_URL = 'https://gitlab.com'.freeze
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))} APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z} SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
<<<<<<< HEAD
SUBSCRIPTIONS_URL = 'https://customers.gitlab.com'.freeze SUBSCRIPTIONS_URL = 'https://customers.gitlab.com'.freeze
SUBSCRIPTIONS_PLANS_URL = "#{SUBSCRIPTIONS_URL}/plans".freeze SUBSCRIPTIONS_PLANS_URL = "#{SUBSCRIPTIONS_URL}/plans".freeze
=======
>>>>>>> upstream/master
VERSION = File.read(root.join("VERSION")).strip.freeze VERSION = File.read(root.join("VERSION")).strip.freeze
REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze
......
...@@ -56,6 +56,7 @@ class Settings < Settingslogic ...@@ -56,6 +56,7 @@ class Settings < Settingslogic
(base_url(gitlab) + [gitlab.relative_url_root]).join('') (base_url(gitlab) + [gitlab.relative_url_root]).join('')
end end
<<<<<<< HEAD
def kerberos_protocol def kerberos_protocol
kerberos.https ? "https" : "http" kerberos.https ? "https" : "http"
end end
...@@ -81,6 +82,8 @@ class Settings < Settingslogic ...@@ -81,6 +82,8 @@ class Settings < Settingslogic
kerberos.enabled && (build_gitlab_kerberos_url != build_gitlab_url) kerberos.enabled && (build_gitlab_kerberos_url != build_gitlab_url)
end end
=======
>>>>>>> upstream/master
# check that values in `current` (string or integer) is a contant in `modul`. # check that values in `current` (string or integer) is a contant in `modul`.
def verify_constant_array(modul, current, default) def verify_constant_array(modul, current, default)
values = default || [] values = default || []
......
...@@ -93,11 +93,14 @@ RSpec.configure do |config| ...@@ -93,11 +93,14 @@ RSpec.configure do |config|
config.include WaitForRequests, :js config.include WaitForRequests, :js
config.include LiveDebugger, :js config.include LiveDebugger, :js
config.include MigrationsHelpers, :migration config.include MigrationsHelpers, :migration
<<<<<<< HEAD
# EE only START # EE only START
config.include EE::LicenseHelpers config.include EE::LicenseHelpers
config.include Rails.application.routes.url_helpers, type: :routing config.include Rails.application.routes.url_helpers, type: :routing
# EE only END # EE only END
=======
>>>>>>> upstream/master
if ENV['CI'] if ENV['CI']
# This includes the first try, i.e. tests will be run 4 times before failing. # This includes the first try, i.e. tests will be run 4 times before failing.
......
require 'active_support/core_ext/hash/transform_values' require 'active_support/core_ext/hash/transform_values'
require 'active_support/hash_with_indifferent_access' require 'active_support/hash_with_indifferent_access'
<<<<<<< HEAD:spec/support/helpers/stub_configuration.rb
require_dependency Gitlab.root.join('ee/spec/support/helpers/ee/stub_configuration') require_dependency Gitlab.root.join('ee/spec/support/helpers/ee/stub_configuration')
=======
>>>>>>> upstream/master:spec/support/helpers/stub_configuration.rb
module StubConfiguration module StubConfiguration
prepend EE::StubConfiguration prepend EE::StubConfiguration
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment