Skip to content
Snippets Groups Projects

Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

Merged Luke "Jared" Bennett requested to merge fix-realtime-edited-text-for-issues-9-3 into master
All threads resolved!

What does this MR do?

Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11375 to master.

There are a few differences so we will need to have a fresh round of reviews.

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

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Phil Hughes
  • @lbennett Looks good, just some small comments! :thumbsup:

  • assigned to @rymai

  • @lbennett A few notes, LGTM otherwise.

  • Luke "Jared" Bennett resolved all discussions

    resolved all discussions

  • added 1 commit

    • 9edae438 - Review changes, improve editable helper spec and add hasUpdated computer to issue_show app

    Compare with previous version

  • added 1 commit

    • 55d7e80a - Fix builds by only merge when updated_at_by is presnse

    Compare with previous version

  • added 1 commit

    • f83278b6 - Fix issue_show app.vue hasUpdated reference to state

    Compare with previous version

  • added 1 commit

    • 80a75f6a - Review changes, improve editable helper spec and add hasUpdated computer to issue_show app

    Compare with previous version

  • Ready for another review @rymai and @iamphill, thanks!

  • Frontend LGTM :thumbsup:

  • assigned to @rymai

  • Phil Hughes approved this merge request

    approved this merge request

  • @lbennett Thanks, sorry I didn't spot that earlier!

  • Luke "Jared" Bennett resolved all discussions

    resolved all discussions

  • Luke "Jared" Bennett resolved all discussions

    resolved all discussions

  • Pushed up those changes. Haven't verified it locally because webpack is having issues. Investigating :)

  • Whoops.

  • Confirmed this works.

  • added 234 commits

    • adbd14cc...35ab669a - 230 commits from branch master
    • af9815eb - Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
    • faa66790 - Review changes, improve editable helper spec and add hasUpdated computer to issue_show app
    • 91c8ae68 - Move issuable_app_data to helper
    • afae31ef - Fix helper methods returning wrong data types for vue

    Compare with previous version

  • added 143 commits

    • 925d3a8f...6ece9792 - 138 commits from branch master
    • f2dbd321 - Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
    • 62fe1e88 - Review changes, improve editable helper spec and add hasUpdated computer to issue_show app
    • 7783eb0d - Move issuable_app_data to helper
    • 2fb7108a - Fix helper methods returning wrong data types for vue
    • 7b5b4713 - Correct editable_helper spec and format issuable_app_data updated_at to iso8061

    Compare with previous version

  • Thanks @rymai :)

  • @lbennett A few more comments.

  • Luke "Jared" Bennett resolved all discussions

    resolved all discussions

  • added 268 commits

    • ad266250...228926da - 262 commits from branch master
    • 07c984d8 - Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.
    • ab0374f4 - Review changes, improve editable helper spec and add hasUpdated computer to issue_show app
    • d537a9a4 - Move issuable_app_data to helper
    • aa1d87bd - Fix helper methods returning wrong data types for vue
    • 33d66a47 - Correct editable_helper spec and format issuable_app_data updated_at to iso8061
    • 632d0c0a - Remove EditableHelper and move method to IssuablesHelper

    Compare with previous version

  • added 1 commit

    • b888ed59 - Fixed issuables_helper_spec and added a test for issuable_app_data

    Compare with previous version

  • @lbennett Last comments, hopefully! ;)

  • Luke "Jared" Bennett resolved all discussions

    resolved all discussions

  • added 1 commit

    • e591401b - Removed unneeded newline in issuables_helper_spec and removed unneeded updated_a…

    Compare with previous version

  • username-removed-128633 resolved all discussions

    resolved all discussions

  • username-removed-128633 approved this merge request

    approved this merge request

  • @lbennett Thanks, looks good to me! :heart:

  • @lbennett Sorry, there are conflicts now... :(

  • I'll fix 'em up :)

  • added 369 commits

    • e591401b...aea03d7c - 368 commits from branch master
    • 5a4a0824 - Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Phil Hughes approved this merge request

    approved this merge request

  • merged

  • Phil Hughes mentioned in commit c3410760

    mentioned in commit c3410760

  • mentioned in issue #34930 (closed)

  • Please register or sign in to reply
    Loading