kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/changelogs/unreleased
History
Fatih Acet ff23636c5f Merge branch '23696-fix-diff-view-highlighting' into 'master' 
Resolve "Highlighting lines is broken"

## What does this MR do?

Add line highlighting back to diff view.  This was working in the MR "changes" tab, but not on a commit page such as 9101e66f57

~~This MR also fixes the `scrollToElement` method in `MergeRequestTabs` to account for the extra height of the tab links which are now fixed in place once they are scrolled to the top of the screen.~~ (removed in favor of !7051)

This MR also refactors much of the `Diff` and `MergeRequestTabs` classes to es6 syntax in an effort to increase readability.

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

Check out both MR "change" tabs and commit diff pages and ensure that line highlighting works and that loading a page with one of these permalink hashes correctly highlights and scrolls to the line.

Ensure I didn't break anything in the transition to es6 syntax.  Check the functionality of the tabs on MR pages, as well as diff page interactivity (unfolding hidden lines in diff files, adding comments to diffs, etc).  I have checked these myself, but another set of eyes would be a good idea.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #23696

See merge request !7090
 		2016-12-03 08:59:19 +00:00
..
.gitkeep
…
4269-public-api.yml Allow public access to some Project API endpoints 2016-12-01 16:39:42 +01:00
7749-add-setting-to-disable-html-emails.yml Add new configuration setting to enable/disable HTML emails. 2016-11-28 17:00:03 -05:00
18546-update-wiki-page-design.yml add CHANGELOG entry for !7429 2016-11-30 15:22:43 -06:00
22373-reduce-queries-in-api-helpers-find_project.yml Make API::Helpers find a project with only one query 2016-11-24 10:19:36 +01:00
22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install.yml New `gitlab:workhorse:install` rake task 2016-11-30 10:34:59 +01:00
22781-user-generated-permalinks.yml add CHANGELOG entry for !7631 2016-11-30 15:28:10 -06:00
23500-enable-colorvariable.yml Enable ColorVariable in scss-lint 2016-12-01 20:22:51 -05:00
23532-define-common-helper-for-describe-pagination-params-in-api.yml
…
23696-fix-diff-view-highlighting.yml update CHANGELOG.md to reflect changes in !7090 2016-12-02 17:32:37 -06:00
23718-backup-rake-task-human-readable.yml Add Human Readable Timestamp to backup tar file 2016-11-30 11:41:53 +01:00
24135-new-project-should-be-below-new-group-on-the-welcome-screen.yml Moved groups above projects 2016-11-29 14:49:30 +00:00
24150-consistent-dropdown-styles.yml Update the Changelog 2016-11-28 23:18:04 +01:00
24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml Remove the help text under the sidebar subscribe button and style it inline 2016-11-30 17:15:25 -06:00
24413-show-unconfirmed-email-status.yml
…
24576_cant_stop_impersonating.yml
…
24669-merge-request-dashboard-page-takes-over-a-minute-to-load.yml Add changelog entry 2016-12-01 12:24:55 +00:00
24710-fix-generic-commit-status-table-row.yml add CHANGELOG.md entry for !7811 2016-11-29 12:55:08 -06:00
24726-remove-across-gitlab.yml 24726 Remove Across GitLab from side navigation 2016-12-01 13:45:14 -08:00
24814-pipeline-tabs.yml Adds changelog entry 2016-11-30 17:06:47 +00:00
24844-environments-date.yml Use created date from last_deployment 2016-11-30 12:44:42 +00:00
24921-hide-prompt-to-add-ssh-key-if-ssh-protocol-is-disabled.yml If SSH prototol is disabled don't say the user requires SSH keys 2016-12-01 22:13:42 +10:00
24999-fix-project-avatar-alignment.yml Fix the width of project avatars in order to adjust alignment within their container element 2016-11-26 16:14:02 -05:00
25002-sentence-case-dashboard-tabs.yml Changes project dashboard tabs to sentence casing 2016-11-26 23:34:19 -05:00
25011-hoverstates-for-collapsed-issue-merge-request-sidebar.yml Adds hoverstates for collapsed Issue/Merge Request sidebar 2016-11-29 16:08:16 +01:00
25026-authenticate-user-for-new-snippet.yml Ensure user is authenticated to create a new snippet 2016-11-28 16:57:49 +01:00
25031-do-not-raise-error-in-autocomplete.yml Do not raise error in AutocompleteController#users when not authorized 2016-11-30 10:09:14 +05:00
25098-header-margins-on-pipeline-settings.yml Fixed row margins on Pipeline Settings page in order to unify styles 2016-12-01 12:46:54 -05:00
25199-fix-broken-urls-in-help-page.yml Fix URL rewritting in the Help section 2016-12-01 16:40:48 +01:00
25251-actionview-template-error-undefined-method-text-for-nil-nilclass.yml Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass 2016-12-02 14:03:30 +02:00
25264-ref-commit.yml Adds changelog entry 2016-12-02 15:30:26 +00:00
api-branch-status.yml API: Expose branch status 2016-11-30 13:13:50 +01:00
api-delete-group-share.yml API: Add endpoint to delete a group share 2016-11-23 12:53:37 +01:00
cleanup-common_utils-js.yml Clean up common_utils.js (!7318) 2016-12-01 23:16:09 +01:00
comments-fixture.yml Replace static fixture for notes_spec (!7683) 2016-12-01 15:04:07 +01:00
create-dynamic-fixture-for-build_spec.yml Create dynamic fixture for build_spec (!7589) 2016-11-25 11:03:31 +01:00
dev-issue-24554.yml
…
dz-allow-nested-group-routing.yml Add nested groups support to the routing 2016-11-23 14:08:36 +02:00
emoji-btn-disabled.yml
…
fix-cancelling-pipelines.yml
…
fix-create-pipeline-with-builds-in-transaction.yml Add Changelog entry for pipeline creation improvements 2016-11-25 10:57:03 +01:00
fix-drop-project-authorized-for-user.yml Update ProjectTeam#fetch_members to use project authorizations 2016-11-23 12:59:13 +02:00
fix-github-branch-formatter.yml Add CHANGELOG entry 2016-12-01 00:03:41 -02:00
fix-slack-pipeline-event.yml
…
hoopes-gitlab-ce-21027-add-diff-hunks-to-notification-emails.yml Fix CHANGELOG 2016-11-25 15:23:50 +00:00
improve-invite-accept-page.yml Add a CHANGELOG entry 2016-11-29 11:29:07 -02:00
issuable_filters_present-refactor.yml Refactor issuable_filters_present to reduce duplications 2016-11-28 14:48:03 +05:00
issue-24534.yml Remove unnecessary sentences for status codes in the API documentation 2016-11-24 10:28:52 -07:00
issue-boards-scrollable-element.yml Fixed issue boards scrolling with a lot of lists & issues 2016-11-24 16:54:24 +00:00
issue_24363.yml Fix appearance in error pages 2016-11-29 11:44:07 -07:00
issue_24748.yml Fix title case to sentence case 2016-11-23 16:34:58 -07:00
issue_24958.yml Fix bad selection on dropdown menu for tags filter 2016-11-25 00:29:26 -07:00
jej-22869.yml Merge branch 'jej-22869' into 'security' 2016-11-28 21:25:18 -03:00
jej-fix-missing-access-check-on-issues.yml Merge branch 'jej-fix-missing-access-check-on-issues' into 'security' 2016-11-28 21:25:46 -03:00
jej-use-issuable-finder-instead-of-access-check.yml Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security' 2016-11-28 21:26:23 -03:00
milestone_start_date.yml Add a starting date to milestones 2016-11-23 13:41:04 +02:00
move-abuse-report-spinach-test-to-rspec.yml Move abuse report spinach test to rspec 2016-11-23 19:30:07 +05:00
move-admin-abuse-report-spinach-test-to-rspec.yml Move admin abuse report spinach test to rspec 2016-11-23 21:40:29 +05:00
move-admin-spam-spinach-test-to-rspec.yml Move admin spam spinach test to Rspec 2016-11-23 20:18:35 +05:00
mr-origin-7855.yml Added a changelog entry 2016-12-02 12:13:28 -05:00
post_receive-any-email.yml
…
process-commit-worker-improvements.yml Pass commit data to ProcessCommitWorker 2016-12-01 13:36:06 +01:00
readme-link-fix.yml Fix broken README.md UX guide link. 2016-11-28 15:51:57 -05:00
remove-backup-strategies.yml Stop supporting Google and Azure as backup strategies 2016-11-24 13:07:24 +01:00
remove-jsx-react-eslint-plugins.yml Remove JSX/React eslint plugins. 2016-11-29 16:15:47 +00:00
remove-require-from-services.yml
…
remove-unnecessary-self-from-user-model.yml
…
removing_unnecessary_indexes.yml Remove unnecessary database indexes 2016-11-29 14:40:48 +02:00
repository-name-emojis
…
right-sidebar-fixture.yml Replace static fixture for right_sidebar_spec (!7687) 2016-11-28 20:34:45 +01:00
rs-project-team-helpers.yml
…
shortcuts-issuable-fixture.yml Replace static fixture for shortcuts_issuable_spec (!7685) 2016-11-23 01:13:36 +01:00
simplify-create-new-list-issue-boards.yml Simplify copy on "Create a new list" dropdown in Issue Boards 2016-11-23 17:28:58 -02:00
update-api-spec-files.yml Changed API spec files to describe the correct class 2016-11-28 10:55:27 -07:00
use-st-commits-where-possible.yml Replace references to MergeRequestDiff#commits with st_commits 2016-12-01 12:17:30 +01:00
zen-mode-fixture.yml Replace static fixture for zen_mode_spec (!7686) 2016-11-23 01:29:32 +01:00
zj-expose-coverage-pipelines.yml Expose coverage on GET pipelines/:id 2016-11-25 15:49:59 +01:00
zj-fix-label-creation-non-members.yml Merge branch 'zj-fix-label-creation-non-members' into 'security' 2016-11-28 21:24:19 -03:00
zj-issue-search-slash-command.yml Add issue search slash command 2016-11-25 15:41:28 +01:00