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
75d9979a
Commit
75d9979a
authored
Jun 17, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
a1ff52b7
c4c12f2a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
...cripts/vue_merge_request_widget/components/deployment.vue
+5
-10
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
...equest_widget/components/mr_widget_pipeline_container.vue
+1
-1
changelogs/unreleased/visual-review-apps-fix-dropdown.yml
changelogs/unreleased/visual-review-apps-fix-dropdown.yml
+5
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
View file @
75d9979a
...
...
@@ -185,11 +185,6 @@ export default {
:link=
"deploymentExternalUrl"
:css-class=
"`deploy-link js-deploy-url inline $
{slotProps.className}`"
/>
<visual-review-app-link
v-if=
"showVisualReviewApp"
:link=
"deploymentExternalUrl"
:app-metadata=
"visualReviewAppMeta"
/>
</
template
>
<
template
slot=
"result"
slot-scope=
"slotProps"
>
...
...
@@ -214,13 +209,13 @@ export default {
:link=
"deploymentExternalUrl"
css-class=
"js-deploy-url js-deploy-url-feature-flag deploy-link btn btn-default btn-sm inline"
/>
</
template
>
<visual-review-app-link
v-if=
"showVisualReviewApp"
:link=
"deploymentExternalUrl"
:app-metadata=
"visualReviewAppMeta"
/>
</template>
</template>
<span
v-if=
"deployment.stop_url"
v-gl-tooltip
...
...
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue
View file @
75d9979a
...
...
@@ -86,7 +86,7 @@ export default {
:class=
"deploymentClass"
:deployment=
"deployment"
:show-metrics=
"hasDeploymentMetrics"
:show-visual-review-app=
"
true
"
:show-visual-review-app=
"
showVisualReviewAppLink
"
:visual-review-app-meta=
"visualReviewAppMeta"
/>
</div>
...
...
changelogs/unreleased/visual-review-apps-fix-dropdown.yml
0 → 100644
View file @
75d9979a
---
title
:
Move Dropdown to Stick to MR View App Button
merge_request
:
29767
author
:
type
:
fixed
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