Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6844a092
Commit
6844a092
authored
Jan 18, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
2ada0c8e
b479ddc7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
15 deletions
+25
-15
.gitlab-ci.yml
.gitlab-ci.yml
+6
-6
app/assets/javascripts/frequent_items/components/app.vue
app/assets/javascripts/frequent_items/components/app.vue
+6
-0
app/assets/javascripts/frequent_items/index.js
app/assets/javascripts/frequent_items/index.js
+5
-1
doc/development/testing_guide/review_apps.md
doc/development/testing_guide/review_apps.md
+8
-8
No files found.
.gitlab-ci.yml
View file @
6844a092
...
...
@@ -555,12 +555,12 @@ setup-test-env:
cache
:
{}
dependencies
:
[]
environment
:
&review-environment
name
:
review/
${CI_COMMIT_REF_NAME
}
url
:
https://gitlab-
${CI_ENVIRONMENT_SLUG
}.${REVIEW_APPS_DOMAIN}
name
:
review/
mr-${CI_MERGE_REQUEST_IID
}
url
:
https://gitlab-
mr-${CI_MERGE_REQUEST_IID
}.${REVIEW_APPS_DOMAIN}
only
:
refs
:
-
branche
s@gitlab-org/gitlab-ce
-
branche
s@gitlab-org/gitlab-ee
-
merge_request
s@gitlab-org/gitlab-ce
-
merge_request
s@gitlab-org/gitlab-ee
kubernetes
:
active
except
:
refs
:
...
...
@@ -1121,8 +1121,8 @@ review-deploy:
allow_failure
:
true
variables
:
GIT_DEPTH
:
"
1"
HOST_SUFFIX
:
"
${CI_ENVIRONMENT_SLUG
}"
DOMAIN
:
"
-
${CI_ENVIRONMENT_SLUG
}.${REVIEW_APPS_DOMAIN}"
HOST_SUFFIX
:
"
mr-${CI_MERGE_REQUEST_IID
}"
DOMAIN
:
"
-
mr-${CI_MERGE_REQUEST_IID
}.${REVIEW_APPS_DOMAIN}"
GITLAB_HELM_CHART_REF
:
"
master"
API_TOKEN
:
"
${GITLAB_BOT_MULTI_PROJECT_PIPELINE_POLLING_TOKEN}"
environment
:
...
...
app/assets/javascripts/frequent_items/components/app.vue
View file @
6844a092
...
...
@@ -47,6 +47,12 @@ export default {
}
eventHub
.
$on
(
`
${
this
.
namespace
}
-dropdownOpen`
,
this
.
dropdownOpenHandler
);
// As we init it through requestIdleCallback it could be that the dropdown is already open
const
namespaceDropdown
=
document
.
getElementById
(
`nav-
${
this
.
namespace
}
-dropdown`
);
if
(
namespaceDropdown
&&
namespaceDropdown
.
classList
.
contains
(
'
show
'
))
{
this
.
dropdownOpenHandler
();
}
},
beforeDestroy
()
{
eventHub
.
$off
(
`
${
this
.
namespace
}
-dropdownOpen`
,
this
.
dropdownOpenHandler
);
...
...
app/assets/javascripts/frequent_items/index.js
View file @
6844a092
...
...
@@ -17,7 +17,7 @@ const frequentItemDropdowns = [
},
];
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
initFrequentItemDropdowns
=
()
=>
{
frequentItemDropdowns
.
forEach
(
dropdown
=>
{
const
{
namespace
,
key
}
=
dropdown
;
const
el
=
document
.
getElementById
(
`js-
${
namespace
}
-dropdown`
);
...
...
@@ -66,4 +66,8 @@ document.addEventListener('DOMContentLoaded', () => {
},
});
});
};
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
requestIdleCallback
(
initFrequentItemDropdowns
);
});
doc/development/testing_guide/review_apps.md
View file @
6844a092
...
...
@@ -74,27 +74,27 @@ Note that both jobs first wait for the `review-deploy` job to be finished.
### Run a Rails console?
1.
[
Filter Workloads by your Review App slug
](
https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps
)
, e.g.
`review-
29951-issu-id2qax
`
.
1.
Find and open the
`task-runner`
Deployment, e.g.
`review-
29951-issu-id2qax
-task-runner`
.
1.
Click on the Pod in the "Managed pods" section, e.g.
`review-
29951-issu-id2qax
-task-runner-d5455cc8-2lsvz`
.
, e.g.
`review-
mr-24388-314997
`
.
1.
Find and open the
`task-runner`
Deployment, e.g.
`review-
mr-24388-314997
-task-runner`
.
1.
Click on the Pod in the "Managed pods" section, e.g.
`review-
mr-24388-314997
-task-runner-d5455cc8-2lsvz`
.
1.
Click on the
`KUBECTL`
dropdown, then
`Exec`
->
`task-runner`
.
1.
Replace
`-c task-runner -- ls`
with
`-- /srv/gitlab/bin/rails c`
from the
default command or
-
Run
`kubectl exec --namespace review-apps-ce -it review-
29951-issu-id2qax
-task-runner-d5455cc8-2lsvz -- /srv/gitlab/bin/rails c`
-
Run
`kubectl exec --namespace review-apps-ce -it review-
mr-24388-314997
-task-runner-d5455cc8-2lsvz -- /srv/gitlab/bin/rails c`
and
-
Replace
`review-apps-ce`
with
`review-apps-ee`
if the Review App
is running EE, and
-
Replace
`review-
29951-issu-id2qax
-task-runner-d5455cc8-2lsvz`
-
Replace
`review-
mr-24388-314997
-task-runner-d5455cc8-2lsvz`
with your Pod's name.
### Dig into a Pod's logs?
1.
[
Filter Workloads by your Review App slug
](
https://console.cloud.google.com/kubernetes/workload?project=gitlab-review-apps
)
, e.g.
`review-
1979-1-mul-dnvlhv
`
.
, e.g.
`review-
mr-24388-314997
`
.
1.
Find and open the
`migrations`
Deployment, e.g.
`review-
1979-1-mul-dnvlhv
-migrations.1`
.
`review-
mr-24388-314997
-migrations.1`
.
1.
Click on the Pod in the "Managed pods" section, e.g.
`review-
1979-1-mul-dnvlhv
-migrations.1-nqwtx`
.
`review-
mr-24388-314997
-migrations.1-nqwtx`
.
1.
Click on the
`Container logs`
link.
## Frequently Asked Questions
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment