Skip to content
Snippets Groups Projects
Select Git revision
  • move-gl-dropdown
  • improve-table-pagination-spec
  • move-markdown-preview
  • winh-fix-merge-request-spec
  • master default
  • index-namespaces-lower-name
  • winh-single-karma-test
  • 10-3-stable
  • 36782-replace-team-user-role-with-add_role-user-in-specs
  • winh-modal-internal-state
  • tz-ide-file-icons
  • 38869-milestone-select
  • update-autodevops-template
  • jivl-activate-repo-cookie-preferences
  • qa-add-deploy-key
  • docs-move-article-ldap
  • 40780-choose-file
  • 22643-manual-job-page
  • refactor-cluster-show-page-conservative
  • dm-sidekiq-versioning
  • v10.4.0.pre
  • v10.3.0
  • v10.3.0-rc5
  • v10.3.0-rc4
  • v10.3.0-rc3
  • v10.3.0-rc2
  • v10.2.5
  • v10.3.0-rc1
  • v10.0.7
  • v10.1.5
  • v10.2.4
  • v10.2.3
  • v10.2.2
  • v10.2.1
  • v10.3.0.pre
  • v10.2.0
  • v10.2.0-rc4
  • v10.2.0-rc3
  • v10.1.4
  • v10.2.0-rc2
40 results

diffs

  • Clone with SSH
  • Clone with HTTPS
  • Forked from GitLab.org / GitLab FOSS
    10371 commits behind the upstream repository.
    Douwe Maan's avatar
    Douwe Maan authored
    Add diff hunks to notification emails
    
    Add diff hunks to notification emails. Continued from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5855 - thanks @hoopes!
    
    This also fixes an issue where the + / - prefixes were missing from diffs in emails.
    
    Screenshots (from my browser) of the HTML emails, along with text screenshots :stuck_out_tongue:
    
    ![image](/uploads/cb31400becf5149d40c8bb98a655aa93/image.png)
    
    ```
    New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:
    
    http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1023
    
    >          Finished
    
    This is a comment at the top of a match section.
    ```
    
    ![image](/uploads/704dd3845797530697a27f5c1953c053/image.png)
    
    ```
    New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:
    
    http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1022
    
    >          Finished
    >          %span.badge.js-running-count= @all_builds.finished.count(:id)
    >  
    > -    %li{class: ('active' if @scope == 'all')}
    > -      = link_to admin_builds_path(scope: :all) do
    > -        All
    > -        %span.badge.js-totalbuilds-count= @all_builds.count(:id)
    > -
    >  .gray-content-block
    >    #{(@scope || 'running').capitalize} builds
    >  
    
    This is a comment at the bottom of a match section.
    ```
    
    ![image](/uploads/4063f3d9738aea8ebf3c0e690d0eddee/image.png)
    
    ```
    New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:
    
    http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1024
    
    >          = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
    >  
    >    %ul.center-top-menu
    > -    %li{class: ('active' if @scope.nil?)}
    > +    %li{class: ('active' if @scope == 'all')}
    >        = link_to admin_builds_path do
    > +        All
    
    This is a comment with some deleted and added lines above it.
    ```
    
    Closes #21027, closes #24340.
    
    See merge request !7660
    b0bde100
    History