Commit ae9d29bc authored by Fatih Acet's avatar Fatih Acet Committed by Alejandro Rodríguez

Merge branch '24780-show-last-updated-or-resolved-in-mr-discussion' into 'master'

resolves updated and resolved status is not showing

## What does this MR do?
This MR fixes #24780 

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?
This MRs removes some important information as par suggested design in #19797. it restores that information

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry]( added
- [ ] [Documentation created/updated](
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](
- [x] Conform by the [style guides](
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](

## What are the relevant issue numbers?

Closes #24780

See merge request !7655
parent 7e828614
......@@ -32,6 +32,7 @@
an outdated diff
= time_ago_with_tooltip(discussion.created_at, placement: "bottom", html_class: "note-created-ago")
= render "discussions/headline", discussion: discussion
.discussion-body.js-toggle-content{ class: ("hide" unless expanded) }
- if discussion.diff_discussion? && discussion.diff_file
......@@ -201,7 +201,7 @@ feature 'Diff notes resolve', feature: true, js: true do
expect(first('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{}")
expect(page).not_to have_content('Last updated')
expect(page).to have_content('Last updated')
page.within '.line-resolve-all-container' do
expect(page).to have_content('0/1 discussion resolved')
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment