Commit 54c11e9d authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-21

# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js
#	app/assets/javascripts/pages/search/init_filtered_search.js
#	app/views/groups/issues.html.haml
#	config/webpack.config.js
#	doc/user/project/integrations/prometheus_library/kubernetes.md
#	spec/javascripts/filtered_search/dropdown_user_spec.js

[ci skip]
parents 5e2d5e17 88870c87
...@@ -58,11 +58,14 @@ var Dispatcher; ...@@ -58,11 +58,14 @@ var Dispatcher;
case 'projects:show': case 'projects:show':
shortcut_handler = true; shortcut_handler = true;
break; break;
<<<<<<< HEAD
case 'projects:edit': case 'projects:edit':
import(/* webpackChunkName: "ee_projects_edit" */ 'ee/pages/projects/edit') import(/* webpackChunkName: "ee_projects_edit" */ 'ee/pages/projects/edit')
.then(callDefault) .then(callDefault)
.catch(fail); .catch(fail);
break; break;
=======
>>>>>>> upstream/master
case 'groups:activity': case 'groups:activity':
import('./pages/groups/activity') import('./pages/groups/activity')
.then(callDefault) .then(callDefault)
......
...@@ -75,6 +75,19 @@ export default class FilteredSearchDropdownManager { ...@@ -75,6 +75,19 @@ export default class FilteredSearchDropdownManager {
}, },
element: this.container.querySelector('#js-dropdown-milestone'), element: this.container.querySelector('#js-dropdown-milestone'),
}, },
<<<<<<< HEAD
=======
label: {
reference: null,
gl: DropdownNonUser,
extraArguments: {
endpoint: `${this.baseEndpoint}/labels.json`,
symbol: '~',
preprocessing: DropdownUtils.duplicateLabelPreprocessing,
},
element: this.container.querySelector('#js-dropdown-label'),
},
>>>>>>> upstream/master
'my-reaction': { 'my-reaction': {
reference: null, reference: null,
gl: DropdownEmoji, gl: DropdownEmoji,
......
import FilteredSearchManager from '~/filtered_search/filtered_search_manager'; import FilteredSearchManager from '~/filtered_search/filtered_search_manager';
<<<<<<< HEAD
export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => { export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => {
const filteredSearchEnabled = FilteredSearchManager && document.querySelector('.filtered-search'); const filteredSearchEnabled = FilteredSearchManager && document.querySelector('.filtered-search');
if (filteredSearchEnabled) { if (filteredSearchEnabled) {
...@@ -8,6 +9,12 @@ export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => { ...@@ -8,6 +9,12 @@ export default ({ page, filteredSearchTokenKeys, stateFiltersSelector }) => {
filteredSearchTokenKeys, filteredSearchTokenKeys,
stateFiltersSelector, stateFiltersSelector,
}); });
=======
export default ({ page }) => {
const filteredSearchEnabled = FilteredSearchManager && document.querySelector('.filtered-search');
if (filteredSearchEnabled) {
const filteredSearchManager = new FilteredSearchManager({ page });
>>>>>>> upstream/master
filteredSearchManager.setup(); filteredSearchManager.setup();
} }
}; };
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= webpack_bundle_tag 'common_vue' = webpack_bundle_tag 'common_vue'
<<<<<<< HEAD
= webpack_bundle_tag 'issues' = webpack_bundle_tag 'issues'
=======
>>>>>>> upstream/master
- if group_issues_exists - if group_issues_exists
.top-area .top-area
......
...@@ -48,7 +48,10 @@ var config = { ...@@ -48,7 +48,10 @@ var config = {
}, },
context: path.join(ROOT_PATH, 'app/assets/javascripts'), context: path.join(ROOT_PATH, 'app/assets/javascripts'),
entry: { entry: {
<<<<<<< HEAD
add_gitlab_slack_application: './add_gitlab_slack_application/index.js', add_gitlab_slack_application: './add_gitlab_slack_application/index.js',
=======
>>>>>>> upstream/master
balsamiq_viewer: './blob/balsamiq_viewer.js', balsamiq_viewer: './blob/balsamiq_viewer.js',
blob: './blob_edit/blob_bundle.js', blob: './blob_edit/blob_bundle.js',
boards: './boards/boards_bundle.js', boards: './boards/boards_bundle.js',
......
...@@ -31,6 +31,7 @@ In order to isolate and only display relevant CPU and Memory metrics for a given ...@@ -31,6 +31,7 @@ In order to isolate and only display relevant CPU and Memory metrics for a given
Instead, the [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) name should begin with [CI_ENVIRONMENT_SLUG](../../../../ci/variables/README.md#predefined-variables-environment-variables). It can be followed by a `-` and additional content if desired. For example, a deployment name of `review-homepage-5620p5` would match the `review/homepage` environment. Instead, the [Deployment](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/) or [DaemonSet](https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/) name should begin with [CI_ENVIRONMENT_SLUG](../../../../ci/variables/README.md#predefined-variables-environment-variables). It can be followed by a `-` and additional content if desired. For example, a deployment name of `review-homepage-5620p5` would match the `review/homepage` environment.
If you are using [GitLab Auto-Deploy](../../../../ci/autodeploy/index.md) and one of the two [provided Kubernetes monitoring solutions](../prometheus.md#getting-started-with-prometheus-monitoring), the `environment` label will be automatically added. If you are using [GitLab Auto-Deploy](../../../../ci/autodeploy/index.md) and one of the two [provided Kubernetes monitoring solutions](../prometheus.md#getting-started-with-prometheus-monitoring), the `environment` label will be automatically added.
<<<<<<< HEAD
## Displaying Canary metrics ## Displaying Canary metrics
...@@ -46,3 +47,5 @@ These metrics expect an `environment` label of the form `$CI_ENVIRONMENT_SLUG-ca ...@@ -46,3 +47,5 @@ These metrics expect an `environment` label of the form `$CI_ENVIRONMENT_SLUG-ca
| ---- | ----- | | ---- | ----- |
| Average Memory Usage (MB) | (sum(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job)) /1024/1024 | | Average Memory Usage (MB) | (sum(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job))) / count(avg(container_memory_usage_bytes{container_name!="POD",environment="%{ci_environment_slug}-canary"}) without (job)) /1024/1024 |
| Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100 | | Average CPU Utilization (%) | sum(avg(rate(container_cpu_usage_seconds_total{container_name!="POD",environment="%{ci_environment_slug}-canary"}[2m])) without (job)) * 100 |
=======
>>>>>>> upstream/master
import DropdownUtils from '~/filtered_search/dropdown_utils'; import DropdownUtils from '~/filtered_search/dropdown_utils';
import DropdownUser from '~/filtered_search/dropdown_user'; import DropdownUser from '~/filtered_search/dropdown_user';
import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer'; import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
<<<<<<< HEAD
=======
>>>>>>> upstream/master
import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys'; import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys';
describe('Dropdown User', () => { describe('Dropdown User', () => {
......
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