diff options
-rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/info.vue | 35 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 8 | ||||
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 8 |
3 files changed, 17 insertions, 34 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/info.vue b/app/assets/javascripts/ide/components/merge_requests/info.vue index b146aea4f45..fba287916dd 100644 --- a/app/assets/javascripts/ide/components/merge_requests/info.vue +++ b/app/assets/javascripts/ide/components/merge_requests/info.vue @@ -1,47 +1,24 @@ <script> import { mapGetters } from 'vuex'; import Icon from '../../../vue_shared/components/icon.vue'; -import timeago from '../../../vue_shared/mixins/timeago'; -import tooltip from '../../../vue_shared/directives/tooltip'; import TitleComponent from '../../../issue_show/components/title.vue'; import DescriptionComponent from '../../../issue_show/components/description.vue'; -const states = { - open: 'open', - closed: 'closed', -}; - export default { - directives: { - tooltip, - }, components: { Icon, TitleComponent, DescriptionComponent, }, - mixins: [timeago], computed: { ...mapGetters(['currentMergeRequest']), - isOpen() { - return this.currentMergeRequest.state === states.open; - }, - isClosed() { - return this.currentMergeRequest.state === states.closed; - }, - authorUsername() { - return `@${this.currentMergeRequest.author.username}`; - }, - iconName() { - return this.isOpen ? 'issue-open-m' : 'close'; - }, }, }; </script> <template> <div class="ide-merge-request-info"> - <div class="detail-page-header"> + <div class="detail-page-header sticky-top bg-white"> <icon name="git-merge" class="align-self-center append-right-8" @@ -64,13 +41,3 @@ export default { </div> </div> </template> - -<style scoped> -.ide-merge-request-info { - overflow: auto; -} - -.detail-page-header { - line-height: initial; -} -</style> diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 3c24aaa65e8..7e5b5092857 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -1329,3 +1329,11 @@ line-height: 16px; color: $gl-text-color-secondary; } + +.ide-merge-request-info { + overflow: auto; + + .detail-page-header { + line-height: initial; + } +} diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index eba39bb6ccc..accec232bb8 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -306,6 +306,14 @@ describe API::MergeRequests do expect(json_response['changes_count']).to eq(merge_request.merge_request_diff.real_size) end + it 'exposes description and title html' do + get api("/projects/#{project.id}/merge_requests/#{merge_request.iid}?render_html=true", user) + + expect(response).to have_gitlab_http_status(200) + + expect(json_response).to include(['title_html', 'description_html']) + end + context 'merge_request_metrics' do before do merge_request.metrics.update!(merged_by: user, |