Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

The merged commit text on a PR is squished together #1701

Description

@mattr-

Description

After merging a PR, the merge commit is text is squished together, as seen in the actual behavior section of this issue.

Steps to Reproduce

  1. Add the tracks repo - it's public - as a project folder to atom
  2. Open test/controllers/search_controller_test.rb with Cmd-T
  3. Open the GitHub tab (Ctrl-Shift-8)
  4. Select PR 2117 from the list of pull requests to open the PR view
  5. Scroll down to the section of the pane that contains the merge indication

Expected behavior:

Expected the text to be merged commit as in this doctored screenshot:
doctored screenshot expected behavior

Actual behavior:

screenshot of actual behavior

the text mergedcommit is squished together rather than being displayed as merged commit

Reproduces how often:

Always.

Versions

Running on OS X 10.13.6

atom-github package version screenshot

$ atom --version
apmAtom    : 1.30.0
Electron: 2.0.5
Chrome  : 61.0.3163.100
Node    : 8.9.3
$ apm --version
apm  1.19.0
npm  3.10.10
node 6.9.5 x64
atom 1.30.0
python 2.7.15
git 2.18.0

Additional Information

I looked into the code for this briefly, and it looks like the UI in question is rendered here:

<span className="username">{actor ? actor.login : 'someone'}</span> merged
{this.renderCommit()} into
{' '}<span className="merge-ref">{mergeRefName}</span> on <Timeago time={createdAt} />

I'm not familiar enough with React to know how to handle this particular situation but would be happy to follow guidance or pair with someone on a fix. 🙂

Thanks for your attention! ❤️

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions