Dmitriy Zaporozhets 541f7675f9 Merge branch 'fix-diff-patch-public-mr' into 'master' ... 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		2015-06-23 15:03:00 +00:00
..
backend	Fix downloading of patches on public merge requests when user logged out	2015-06-23 05:34:21 -07:00
bitbucket_import	Use Projects::CreateService to create imported projects so hooks are executed.	2015-04-06 14:51:09 +02:00
diff	Fix commit comments on first line of diff not rendering in Merge Request Discussion view.	2015-02-20 10:23:34 +01:00
github_import	Use Projects::CreateService to create imported projects so hooks are executed.	2015-04-06 14:51:09 +02:00
gitlab_import	Use Projects::CreateService to create imported projects so hooks are executed.	2015-04-06 14:51:09 +02:00
gitorious_import	Define GITORIOUS_HOST only once	2015-06-10 01:31:27 -04:00
google_code_import	Show incompatible projects in Google Code import status	2015-04-30 06:56:49 -07:00
graphs
ldap	Don't accidentally unblock auto created users from Active Directory.	2015-05-12 11:26:43 +02:00
markdown	Merge branch 'ignore-references' into 'master'	2015-06-02 18:39:18 +00:00
middleware	Revert "Increase timeout for Git-over-HTTP requests."	2015-03-19 18:29:20 -07:00
o_auth	Make provider a select for identities form in admin area	2015-06-22 16:53:11 +02:00
satellite	Fix downloading of patches on public merge requests when user logged out	2015-06-23 05:34:21 -07:00
sidekiq_middleware	Use SIGKILL by default in Sidekiq::MemoryKiller	2015-05-13 17:09:12 +02:00
access.rb	Improve description of branch protection levels.	2015-05-13 09:41:55 +02:00
app_logger.rb
asciidoc.rb	Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)	2015-05-18 20:48:03 +02:00
auth.rb
bitbucket_import.rb	Fix specs.	2015-02-24 15:07:24 +01:00
blacklist.rb
closing_issue_extractor.rb	Make use of to_reference in more specs	2015-05-26 15:49:22 -04:00
compare_result.rb
config_helper.rb
contributions_calendar.rb	Fix contributions calendar empty problem under mysql	2015-04-25 20:13:52 +08:00
contributor.rb	Move lib/gitlab/contributors to its correct path	2015-04-09 15:34:55 -04:00
current_settings.rb	session_expire_seconds => session_expire_delay	2015-06-10 22:10:00 -04:00
force_push_check.rb	Fewer constants, more helpers.	2015-03-19 10:34:04 +01:00
git.rb	Use Gitlab::Git helper methods and constants as much as possible.	2015-03-10 13:39:31 +01:00
git_access.rb	Fix GitAccess.	2015-05-13 09:46:22 +02:00
git_access_status.rb	Rubocop enabled for: Use spaces inside hash literal braces	2015-02-02 20:36:54 -08:00
git_access_wiki.rb	Improve Git access error messages.	2015-05-13 09:41:55 +02:00
git_logger.rb
git_ref_validator.rb	fix system silent call	2014-11-06 13:07:42 +02:00
gitorious_import.rb	Define GITORIOUS_HOST only once	2015-06-10 01:31:27 -04:00
identifier.rb	Use project.commit convenience method.	2015-04-24 12:29:36 +02:00
import_formatter.rb	Add Bitbucket importer.	2015-02-24 15:07:24 +01:00
inline_diff.rb
issues_labels.rb
key_fingerprint.rb	Simplify regex.	2015-04-14 15:58:28 +02:00
logger.rb
markdown.rb	Add a pipeline context option for SanitizationFilter	2015-06-02 13:04:10 -04:00
markup_helper.rb	Simplify and unify helpers for rendering markup	2015-05-18 22:52:13 +02:00
note_data_builder.rb	No longer needed to pass project argument to commit methods.	2015-04-24 12:29:36 +02:00
popen.rb	Style/RedundantReturn enabled	2015-03-24 18:35:57 -07:00
production_logger.rb
project_search_results.rb	Revert "No need to check if repository_ref is present"	2015-06-09 15:18:15 +02:00
push_data_builder.rb	Dont set checkout sha for removed branch/tag	2015-06-15 17:54:22 +02:00
reference_extractor.rb	Ignore references in blockquotes.	2015-06-02 13:17:21 +02:00
regex.rb	Fix (project_)name_regex to accept non-ASCII letters and dash	2015-04-27 16:38:47 +02:00
search_results.rb	Add search issues/MR by number	2015-05-18 13:09:13 +06:00
seeder.rb	Revert "Create dev fixture projects with fixed visibility"	2014-11-10 16:17:04 +02:00
sidekiq_logger.rb
snippet_search_results.rb
themes.rb	Add Gitlab::Themes module; remove Gitlab::Theme	2015-06-13 17:58:16 -04:00
upgrader.rb	Fix upgrader script	2015-05-23 13:11:23 +03:00
url_builder.rb	Enforce restricted visibilities for snippets	2015-03-08 17:57:08 -06:00
user_access.rb
utils.rb	add common method to force utf8 and force oauth properties to be utf8	2015-05-03 00:43:46 +03:00
version_info.rb
visibility_level.rb	Move application setting to separate variable.	2015-03-18 13:55:41 -07:00