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

gitlab

  • Clone with SSH
  • Clone with HTTPS
    • Forked from GitLab.org / GitLab FOSS
    35043 commits behind the upstream repository.
    user avatar
    Merge branch 'fix-diff-patch-public-mr' into 'master'
    Dmitriy Zaporozhets authored 
    Fix downloading of patches on public merge requests when user logged out

### What does this MR do?

This MR makes it possible to download a diff patch on a public merge request when a user is logged out.

### Why was this MR needed?

An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button:

```
NoMethodError - undefined method `id' for nil:NilClass:
  lib/gitlab/backend/shell_env.rb:9:in `set_env'
  lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite'
  lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite'
  app/models/merge_request.rb:219:in `to_diff'
  app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show'
```

### What are the relevant issue numbers?

* Closes #1225
* Closes #1854 (dup)
* Closes #1858 (dup)

See merge request !872
    541f7675
    History
    user avatar 541f7675
    History
    Name Last commit Last update
    ..
    backend
    bitbucket_import
    diff
    github_import
    gitlab_import
    gitorious_import
    google_code_import
    graphs
    ldap
    markdown
    middleware
    o_auth
    satellite
    sidekiq_middleware
    access.rb
    app_logger.rb
    asciidoc.rb
    auth.rb
    bitbucket_import.rb
    blacklist.rb
    closing_issue_extractor.rb
    compare_result.rb
    config_helper.rb
    contributions_calendar.rb
    contributor.rb
    current_settings.rb
    force_push_check.rb
    git.rb
    git_access.rb
    git_access_status.rb
    git_access_wiki.rb
    git_logger.rb
    git_ref_validator.rb
    gitorious_import.rb
    identifier.rb
    import_formatter.rb
    inline_diff.rb
    issues_labels.rb
    key_fingerprint.rb
    logger.rb
    markdown.rb
    markup_helper.rb
    note_data_builder.rb
    popen.rb
    production_logger.rb
    project_search_results.rb
    push_data_builder.rb
    reference_extractor.rb
    regex.rb
    search_results.rb
    seeder.rb
    sidekiq_logger.rb
    snippet_search_results.rb
    themes.rb
    upgrader.rb
    url_builder.rb
    user_access.rb
    utils.rb
    version_info.rb
    visibility_level.rb