Skip to content
Snippets Groups Projects

Disable reference generation in preformatted/code blocks

Merged Stan Hu requested to merge stanhu/gitlab-ce:disable-ref-generation-in-code-blocks into master

Summary

If a user adds text in code or preformatted text via Markdown or HTML that contains #XXX, the system adds a note that issue XXX was mentioned. This is particularly annoying because we often list gdb backtrace dumps into our issues, and many issues get mentioned as a result. For example:

(gdb) bt
#0  0x00000000004004c4 in second () at main.cc:6
#1  0x00000000004004d2 in first () at main.cc:11
#2  0x00000000004004dd in main () at main.cc:17
(gdb) 

Steps to reproduce

  1. In an issue, write the above text using Markdown or HTML tags (e.g. <code>, <pre>).
  2. Observe that issue 1 and issue 2 have a note that says they were mentioned.

Expected behavior

Everything enclosed in the code blocks should be ignored as references.

Observed behavior

Issues get referenced unnecessarily.

Fix

I've made reference_extractor.rb strip out HTML and Markdown blocks before processing. I considered running the raw text through the entire Markdown processor, but this seems overkill and perhaps could lead to some unintended side effects.

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
  • Stan Hu Added 196 new commits:

    Added 196 new commits:

    • ddd381c9 - Add criteria for requesting CVE
    • d881a927 - Merge branch 'cve-if-needed' into 'master'
    • de629b48 - Blocking user does not remove him/her from project/groups but show blocked label
    • d086221f - Merge branch 'active-users' into 'master'
    • e0caed91 - Improve tree view UI
    • fcaf0a89 - Fix heading small color to darker one
    • c6b24211 - Render milestone progress with one helper method
    • 3e6147ad - Make milestone titles in list to be bold
    • 2a76c7fd - Merge branch 'improve-milestones-ui' into 'master'
    • dd24c3d4 - Improve user block/unblock UI in admin area
    • 5a51a798 - Merge branch 'admin-user-block' into 'master'
    • d36ee319 - Add starred projects page to dashboard
    • b8d73315 - Add tests for starred projects page
    • b51e2a05 - Merge branch 'starred-projects' into 'master'
    • 6b76ffc2 - Apply more styles from Flatly theme
    • b70b1055 - Merge branch 'more-flat-ui' into 'master'
    • 90f5dacc - Fix wrong body padding and pre color
    • 86a17390 - Make broadcast message look like a warning by default
    • 9720240b - Increate default font-size from 13 to 14px
    • 3bce263a - Reduce base vertical padding
    • f6113c28 - Merge branch 'font-size-14' into 'master'
    • 21c99e6a - Fix font size for collapse button
    • b26ab0ce - This MR extends the commit calendar so it searches for commits made with every e…
    • 94a95589 - Merge branch 'fix-commit-calendar-emails' into 'master'
    • 27e3b47b - Fix user fixtures for development
    • 6187670f - Merge branch 'fix-dev-fixture' into 'master'
    • bb7be246 - Show active users(non-blocked) on admin dashboard
    • bb9560a3 - Show total user count on dashboard page
    • dbb514e7 - Merge branch 'active-users' into 'master'
    • cb65a3f1 - Changed button styles
    • 8bcff0f1 - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into button_changes
    • 1e42cd20 - Added a warning class to button
    • d6c13ec0 - Merge branch 'button_changes' into 'master'
    • 890f1478 - Add link to smtp documentation.
    • 41913fcc - Merge branch 'smtp_example_update' into 'master'
    • 9b3e156e - Move profile groups page to dashboard
    • 7e425877 - Move Profile groups tests to Dashboard group tests
    • de11c13a - Fix dashboard groups test
    • 7e574a89 - Merge branch 'dashboard-groups' into 'master'
    • fc64b3f7 - remove duplicate right braces ('}') in configuration examples of GitHub,
    • 410c8024 - Merge pull request #8938 (moved) from kcyeu/master
    • 454810fe - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • df13c9ca - Hide user page sidebar for mobilde devices
    • 2e99d7c9 - Prevent date overflow on issue page on mobile devices
    • a3e18d87 - Merge branch 'mobile-improvements' into 'master'
    • 3bfd5314 - Replace bs-callout with alert
    • cd73b26e - Refactor gitlab css state colors
    • 3cbc0b1c - Cleanup css variables
    • ceb8f9df - Remove custom css for panels and navs
    • 887cf5c7 - Better name for pages css dir
    • 433b4c76 - Apply some styles from flatly theme
    • 4f3d7048 - Move mixins and bootstrap css to base directory
    • e2b8025a - Increase input padding and fit issue form in laptop screen
    • be3edeb6 - Small UI improvements after css refactoring
    • ed616f23 - Merge branch 'css-cleanup' into 'master'
    • 9f089ac4 - use constant-time string compare for internal api authentication
    • 8d9823ab - Merge pull request #8928 (closed) from Mic92/master
    • 663b3c96 - Condense commits already in target branch when updating merge request source branch.
    • 84ebc22a - Use 2 periods instead of 3 to signify inclusive range.
    • 7dadd423 - Merge branch 'condensed-mr-commits' into 'master'
    • ad14ed5e - Add tag_push event notification to HipChat and Slack services.
    • 1cc41ce1 - Merge branch 'normalize-slack-hipchat-messages' into 'master'
    • e68ad7fb - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • b673d872 - Send notifications and leave system comments when bulk updating issues.
    • 3cf4359b - Merge branch 'mass-change-comments' into 'master'
    • 6fd06006 - Bugfix #1096 (closed)
    • 0f66b329 - Merge branch 'master' into 'master'
    • 4538719d - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 1475cb9a - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • b5c3e1a4 - Add GitLab UI development kit
    • 69d2e1d8 - Add UI guide to GitLab development help
    • 1b5ca280 - Merge two css files with same name
    • f3d78ee3 - Add markdown info to UI dev kit page
    • f930cf84 - Merge branch 'dev-ui' into 'master'
    • a6bb345d - Add DevKit and development README links to CONTRIBUTING.md
    • b14d21e1 - Use bootstrap buttons with custom colors instead of own css
    • 254542d7 - Merge branch 'bootstrap-btns' into 'master'
    • 38c52b1b - Fix checkbox alignment in application settings
    • cf4fcf25 - Merge branch 'fix-checkbox-align' into 'master'
    • 38862308 - Cache project row on dashboard, group and user page
    • 0092cb8f - Merge branch 'cache-project-row' into 'master'
    • af522ede - Update gemnasium-gitlab-service gem
    • 9e937921 - Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5
    • e7c90e58 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • f12ec5f4 - Add merge and issue event notification for HipChat
    • 671c3134 - Merge branch 'add-more-hipchat-notifications' into 'master'
    • baae3291 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 516bcabb - Increase timeout for Git-over-HTTP requests.
    • d07b2e09 - Merge branch 'timeout' into 'master'
    • 66c61f02 - Re-annotate models
    • 7a8fcc73 - Merge branch 'annotate-models' into 'master'
    • 61acaff5 - Bump gitlab_git to rc15
    • 21a6944b - Merge branch 'bump_gitlab_git' into 'master'
    • c842c452 - Advise on how to help others.
    • c2ac790d - Merge branch 'triage-link' into 'master'
    • 52211ea7 - Added Service Templates to CHANGELOG and fixed typo.
    • 67eb6e92 - Merge branch 'changelog-fix' into 'master'
    • 3d9a766d - Web Hook sends email of pusher
    • 21d660a5 - Merge branch 'web_hook_extend' into 'master'
    • 46f94173 - Update the Changelog.
    • 02f17ce1 - Update changelog.
    • 00778c07 - Move items to the correct version in the changelog.
    • afe5d7d2 - Issue #595 (closed): Support Slack notifications upon issue and merge request events
    • d9ff616f - Code style, directory structure.
    • 19f04cf9 - Execute services for tag push.
    • d86c0cda - Fix specs.
    • f13567ed - Only execute GitlabCiService for push events.
    • ca56d9ff - Don't execute GitlabCiService twice for pushed tags.
    • bbcb12f2 - Execute tag_push services and hooks when tag is created through web UI.
    • 85fa334e - Execute GitlabCiService for both push and tag_push events.
    • d57e809c - Set supported events per project service.
    • 5c910b94 - Set correct object_kind on tag push data.
    • 2c7baed3 - Fix changelog.
    • fc616081 - Fix specs.
    • 63178a95 - Merge branch 'add-more-slack-notifications' into 'master'
    • 94229f24 - Update spring to 1.3.3
    • 694ac548 - Merge branch 'update-spring' into 'master'
    • 65105ff3 - Improve projects list
    • 7b9b9f70 - Fix project create link on group page
    • 6296f65d - Merge branch 'collapsed-projects-list' into 'master'
    • 730a49af - Update rugments, fixes #8900
    • 119ebe30 - Merge pull request #8918 from rumpelsepp/update-rugments
    • c17e11ca - Bump gitlab_git to fix 500 with annotated tags w/o message
    • 06ad715e - Merge branch 'bump_gitlab_git' into 'master'
    • 8b53d9ef - Fix bug with active tab remembering (saving cookie with different path)
    • 7e204cf3 - Added comment notification events to HipChat and Slack services.
    • 76802012 - Merge branch 'add-notes-notifications-to-services' into 'master'
    • 0625d68f - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 4dddaef8 - Automatically link commit ranges to compare page.
    • 83e60cc2 - Merge branch 'commit-range-reference' into 'master'
    • dc558eb2 - Fix width of text in milestone lists.
    • be94e135 - Add assignee icon to milestone merge requests.
    • cec2be2d - Merge branch 'fix-milestone-list-width' into 'master'
    • 87da9185 - Autosave title and description of new issues/MRs.
    • 8be36a2c - Merge branch 'autosave-new-issuables' into 'master'
    • f24e46b8 - Remove pull-review badge since we dont use it
    • 443cf972 - Changed to 'View Build Page'
    • dc7c90f1 - Changed casing
    • 094f4895 - Merge branch 'build_page_text' into 'master'
    • f4387917 - Fix import check for case sensetive namespaces
    • 93a21183 - Merge branch 'case-sensetivity-import' into 'master'
    • 3102454a - Don't show Unassigned in user select when searching.
    • d5d19a9f - Merge branch 'user-select-unassigned' into 'master'
    • 3ff71897 - Clearly mark it as installation from source.
    • 4697daf7 - Merge branch 'installtion-from-source' into 'master'
    • 10212c01 - Count commits in branches as well in the commit calendar
    • c1fc29e1 - Merge branch 'commit_calendar_branches' into 'master'
    • e6a0fb1f - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 6f71f5bb - Fixed changelog for MR 8501
    • dbc61cfc - Merge pull request #8911 from AKoetsier/changelog-8501
    • c5b66532 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • d513ca58 - Revert "Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitl
    • 3702c4ad - Render go-import meta tag for private repos.
    • a7fad44b - Merge branch 'go-import' into 'master'
    • dd37a10d - Don't leak information about private project existence via Git-over-SSH/HTTP.
    • 0e11be40 - Add tests for GrackAuth.
    • 8c47a72a - Merge branch 'project-existence-leak' into 'master'
    • b8c9257f - Fix bug where editing a comment with "+1" or "-1" would cause a server error
    • 66fa4b09 - Merge branch 'fix-edit-note-with-votes' into 'master'
    • 2088cee9 - Fix URL builder to use GitlabRoutingHelper
    • 3d6d0e1e - Merge branch 'fix-namespace-merge-request-url' into 'master'
    • b5ec0d6d - Spelling change Commit Statistics
    • 8e7e77e4 - Merge branch 'commits_statistic' into 'master'
    • f04847a3 - The "GitLab buttons in Gmail" document was not linked from anywhere
    • fe6fb32f - Moved the Gmail integration line into the list of available integrations.
    • 47e38e5c - The "GitLab buttons in Gmail" document was not linked from anywhere
    • 4ecfcb4a - Moved the Gmail integration line into the list of available integrations.
    • 535a3fa4 - Merge branch 'connect_gitlab_buttons_doc' of gitlab.com:perforce/gitlab-ce into …
    • ba215e9c - Merge branch 'connect_gitlab_buttons_doc' into 'master'
    • 7f97c320 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • fbc3cb69 - Add dashboard milestones.
    • 53aec08d - Add changelog entry.
    • e916f1c2 - Merge branch 'dashboard-milestones' into 'master'
    • bf02072a - Properly handle autosave local storage exceptions.
    • c025c0d5 - Merge branch 'webstorage-exception' into 'master'
    • 607f0c05 - Change EmailsOnPush subject to include namespace, repo and branch.
    • 6afb03ee - Remove incorrect footer from EmailsOnPush body.
    • 7b34c9dc - Add list of changed files to EmailsOnPush.
    • 0e7d1fd4 - Add optional title field to service properties.
    • e0c186c3 - Add option to send EmailsOnPush from committer email if domain matches.
    • 85af3e82 - Add option to disable code diffs to EmailOnPush.
    • ae70a80f - Fix links in EmailsOnPush text version.
    • 769f137a - Wrap commit message in EmailsOnPush email.
    • 5d863321 - Send EmailsOnPush when deleting commits using force push.
    • 969de4c1 - Fix EmailsOnPush to allow sending from @company.com for GitLab at gitlab.corp.company.com.
    • f0b78a85 - Clarify EmailsOnPushService options.
    • 4658e554 - Fix EmailsOnPush comparison link to include first commit.
    • 8b551ee3 - Merge branch 'emails-on-push'
    • 21aff22a - Fix link to bitbucket import documentation
    • 6b214a5d - Merge branch 'fix-bitbucket-doc-link' into 'master'
    • 224e104d - fix mass SQL statements on initial push
    • 5782a03f - Merge branch 'fix_initial_push_mass_sql' into 'master'
    • e89ffd54 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 23fabc08 - Fixing import redirect loop
    • 332413d7 - Merge branch 'fix-import-redirect' into 'master'
    • 6fa12353 - Disable reference creation for comments surrounded by code/preformatted blocks
  • Author Maintainer

    @marin, can you review this?

  • Stan Hu Added 155 new commits:

    Added 155 new commits:

    • d7f357a3 - Use pre-wrap for diff code in discussion view
    • aea75cfb - Merge branch 'fix-mr-notes' into 'master'
    • 8e1a3fd1 - Merge branch 'more-flatly' into 'master'
    • abf90611 - Improve import buttons on new project page
    • 9c7faac0 - Merge branch 'resetyle-import' into 'master'
    • 2da27205 - Improve css for file actions
    • dffa2fa9 - Use sass variabled for backgroung and border colors
    • 30ca451f - Refactor buttons
    • f311e189 - Improve compare switch button
    • 9b445c68 - Return some merge widget styles and make it more compact
    • 19e0dafb - Merge branch 'more-flatly'
    • 8fed4352 - Unblock user if they were unblocked in AD.
    • afb69488 - Merge branch 'ldap-unblock-user' into 'master'
    • 141168ad - Change default number of unicorn workers to three.
    • 9bb5986d - Remove unnecessary fetch of commit messages for initial push. This will reduce t…
    • 07f9a3f9 - Merge branch 'follow-on-mr376' into 'master'
    • 2172d7ff - Revert "Merge branch 'follow-on-mr376' into 'master'"
    • 42e97d28 - Merge branch 'fix_tests' into 'master'
    • 2d3a0f6d - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • f96dc629 - Everything from gitlab_git is already UTF-8.
    • 7f4cffd8 - Reuse blob object fetched by Gitlab::Git::Blame.
    • 309f588d - Merge branch 'fix-encoding' into 'master'
    • 59ebcfe0 - Add an example of creating a line break by adding two spaces at
    • 12f1a42e - Merge branch 'enhance_markdown_linebreak_docs' into 'master'
    • affb5b3f - Update documentation for object_kind field in Webhook push and tag push Webhooks
    • 2b0f9f93 - Merge branch 'update-webhooks-docs' into 'master'
    • 27189554 - Fix import pages not working after first load.
    • 823e5457 - Merge branch 'import-options-dup' into 'master'
    • 09791774 - Use custom LDAP label in LDAP signin form.
    • d37d7ffc - Merge branch 'ldap-form' into 'master'
    • e7f4f0ae - Block user if he/she was blocked in Active Directory
    • cca08e14 - Merge branch 'ldap-block-user' into 'master'
    • a1f5ae98 - Show asterisks instead of password in service edit form.
    • 1c3997a7 - Merge branch 'replace_passwords_with_asterisk' into 'master'
    • 7ac62388 - Prevent database query each time we render group avatar
    • bf0c04e5 - Fix specs
    • 2fe69158 - Merge branch 'group-icon-performance' into 'master'
    • f0cbbd70 - Use same constant for amount of items per page
    • fdfa79a7 - Merge branch 'default-pagination' into 'master'
    • dd78cd1c - Style improvements to import page
    • 12ba855f - Merge branch 'improve-import-page' into 'master'
    • 2c0cc2e1 - Added hover state
    • df31e0a8 - Fixed up app_logo
    • e4dc4390 - Reverting pixel change
    • ec1c30ce - Merge branch 'hover_toggle_sidebar'
    • 0b38c3e0 - group controller refactoring
    • d377e94b - Merge branch 'refactoring_group_controllers' into 'master'
    • fff34a7f - Updated help documentation to properly reference EmojiOne. [ci skip]
    • 35124fd5 - Merge branch 'emoji_cheatsheet_fix' into 'master'
    • 5d27b23d - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 158507d9 - Add blue theme to GitLab
    • 59621e90 - Merge branch 'blue-theme' into 'master'
    • 3175438f - Fix missing GitHub organisation repositories on import page.
    • 1065f3d3 - Merge branch 'github-org-repos' into 'master'
    • cdb64a81 - Add items into changelog
    • 5c4f567e - Bump gitlab_git to v7.1.0. It should fix a lot of encoding issues
    • bba14223 - Merge branch 'bump_gitlab_git' into 'master'
    • 5f40253f - Remove annoying notice messages when create/update merge request
    • d0e11f37 - Merge branch 'reduce-notice-count' into 'master'
    • 536d4373 - add AMI update step
    • 66384d7d - Add a note about building AMI to security doc
    • f186b20c - Merge branch 'ami-to-update-guides' into 'master'
    • ea7478d6 - Fix features checkboxes at admin settings page
    • c621a771 - Merge branch 'fix-forms' into 'master'
    • 7fd4dc1e - Remove group rendering from dashboard page
    • 04c674e6 - Cleanup after removing group tab from dashboard aside
    • 8527e8d5 - Fix test for creating group from dashboard
    • 83f7e98d - Add project filter by visibility and tag to explore page
    • 0414b2ae - Remove projects page from dashboard
    • 9839d106 - Rename dashboard landing page to Your projects
    • 4b1bb42b - Fix tests for project removing
    • 9ed71f77 - Remove tests for un-existing page
    • d12a6ac4 - Merge branch 'dashboard-restyle' into 'master'
    • ae7e3806 - Add active users to gitlab:check
    • 0d4328fd - Update CHANGELOG
    • f0a132ed - Merge branch 'active-users-check' into 'master'
    • 6d0ff0ad - Remove placeholder methods to prevent calling methods rather than attributes.
    • 8cebbea7 - Merge branch 'issues_url' into 'master'
    • 757dca2b - Escape wildcards when searching LDAP by username.
    • e349ca13 - Merge branch 'ldap-filter-eq' into 'master'
    • 6653cd73 - Mention EmailsOnPush changes in changelog.
    • ed29933d - Merge branch 'emailsonpush-changelog' into 'master'
    • 383c56ef - Use Gitlab::Git helper methods and constants as much as possible.
    • fe145354 - Merge branch 'gitlab-git-helper-methods' into 'master'
    • 76842aac - Properly move over issues_tracker_id from old custom issue tracker URLs.
    • 82bb3ec3 - Merge branch 'issues-tracker-id' into 'master'
    • cadf7656 - Fix highlight of selected lines
    • 1178dacd - Fix line highlight being hidden by header
    • be11f72d - Merge branch 'fix-line-highlight' into 'master'
    • f5e42f60 - Reject access to group/project avatar if the user doesn't have access.
    • 0fa4d092 - Merge branch 'uploads-authorization' into 'master'
    • ed4c7190 - Fix importers with OCC
    • 02ed61c4 - remove duplication
    • 828519ba - Merge branch 'fix_importers' into 'master'
    • ee45fa89 - Added a link_to for the LinkedIn portion of the user's profile. It felt odd to m…
    • 52a00854 - Merge branch 'master' into 'master'
    • 1fec4eff - Upgrade Docker image to GitLab v7.8.3
    • 14753c2e - Merge branch 'upgrade-dockerfile' into 'master'
    • 96197154 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • c572bdb5 - Add CHANGELOG item about db migration
    • 61ed5187 - Make email display name configurable
    • 94affe6d - Merge branch 'master' into 'master'
    • b7a31a4b - Generate valid json for hooks
    • b0c1bc66 - Merge branch 'generate-valid-json' into 'master'
    • b2f65679 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 4218a2bf - Fix code preview theme setting for comments, issues, merge requests, and snippets.
    • 1647994a - Merge branch 'fix-code-preview' into 'master'
    • 88e4aed9 - Update changelog for 7.8.4.
    • d2d709a2 - Update html-pipeline and emoji
    • d6dda952 - Fix tests for emojione
    • c02d891c - Merge branch 'master' into new-emoji
    • ccc2c6e7 - Fix Gemfile.lock
    • 85e3b25c - Merge branch 'new-emoji' into 'master'
    • ca9aca92 - Allow smb:// links in Markdown text.
    • 11e966d7 - Add changelog item.
    • f29a7ce5 - Merge branch 'markdown-smb-link' into 'master'
    • 3f823068 - Add deploy to ci.gitlab.com to release documents.
    • 3c7e0f45 - replace images in emails with inline images
    • d66148ef - Merge branch 'fix_email_images' into 'master'
    • 0f144f36 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 80b2f3fb - Implement merge requests search
    • ec02cdf2 - Merge branch 'master' into mr-filter-by-title
    • c0579757 - Merge branch 'mr-filter-by-title' into 'master'
    • 6ddd4594 - Make Irker service use the supported events check
    • 606d24ff - Merge branch 'irker-service-use-supported-events' into 'master'
    • 4e49f21b - Set push data object kind in PushDataBuilder.
    • 84d28209 - Use PushDataBuilder where applicable.
    • f2024b1e - More consistent method naming.
    • 10421674 - Ecevute hooks and services when branches are created/deleted through web.
    • 12b779e7 - Move tag deletion to service and execute hooks and services.
    • b160db14 - Add changelog item.
    • b8f5e23f - Merge branch 'tag-branch-hooks' into 'master'
    • b09e8c77 - Bump gitlab_git to 7.1.1
    • 48036751 - Merge branch 'bump-gitlab-git' into 'master'
    • a1b3e239 - Fix typo in CHANGELOG.md
    • 42be733d - Merge pull request #8954 from pupaxxo/patch-2
    • 06439fd7 - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 3aded9d5 - Update changelog with change to unicorn workers number recommendation.
    • 6235b027 - Fix typo
    • 2b721b28 - Merge pull request #8955 from wasamasa/fix-deploy.sh-typo
    • 60df262c - Merge branch 'master' of github.com:gitlabhq/gitlabhq
    • 99f99575 - Use group_member instead of users_group or membership.
    • 31fc73f0 - Use project_member instead of team_member.
    • bbdf2326 - Use member instead of tm.
    • e97cdb04 - Remove old team scopes.
    • 75aff0f7 - Move project members index from /team to /project_members
    • 224187ff - Move group members index from /members to /group_members.
    • 84371de0 - Move group leave action from dashboard/groups to groups/group_members.
    • 5ad35bbe - Use same layout and interactivity for project members as group members.
    • f66b77e6 - Fix failing specs.
    • e88d06c8 - Update button class.
    • 584580e5 - Add changelog item.
    • aad3cbee - Merge branch 'team-members' into 'master'
    • bacb05c5 - Small improvements to group/project member rows
    • 95b44c09 - Disable reference creation for comments surrounded by code/preformatted blocks
  • Stan Hu Added 132 commits:

    Added 132 commits:

    • 95b44c09...6c1074e3 - 131 commits from branch gitlab-org:master
    • 636aa9b9 - Disable reference creation for comments surrounded by code/preformatted blocks
  • Stan Hu Added 1 commit:

    Added 1 commit:

    • fe0a24fe - Bump to v0.7.10
  • Looks interesting. @haynes can you check if tests are green and merge it?

  • @dzaporozhets sure.
    ci is: https://ci.gitlab.com/projects/88/commits/6dfe4b99ffe2369471f1ef59784f10e75ad8799f

    @stanhu I had problem with applying the patch. That's why the second commit isn't included in the ci. But that one only moved the CHANGELOG line so it's ok.
    Can you please squash the 2 commits when the tests are all green? :)

  • Stan Hu Added 1 commit:

    Added 1 commit:

    • 83d552d5 - Disable reference creation for comments surrounded by code/preformatted blocks
  • Author Maintainer

    Squashed.

    This MR fixes this GitHub issue as well:

    https://github.com/gitlabhq/gitlabhq/issues/8764

  • hmm a Spinach test is failing. But the same one is failing on master as well so I guess I'll wait a bit and retry the tests when the master shows green tests again.

  • username-removed-444 Status changed to merged

    Status changed to merged

  • mentioned in commit fb300396

  • username-removed-2900 Milestone changed to 7.10

    Milestone changed to 7.10

  • Sid Sijbrandij mentioned in commit 7ad1008e

    mentioned in commit 7ad1008e

  • Valery Sizov mentioned in commit f3b2b3d0

    mentioned in commit f3b2b3d0

Please register or sign in to reply
Loading