Download as
Browse Code »

Commit 5b40e9acea34574d378ccef67917d57edf8258fb

Authored by Antonio Terceiro
2 parents fedffe21 5ba2fbe6
Exists in master and in 67 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Merge branch 'fixing_remote_user' 

See merge request !3
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
cookbooks/gitlab/templates/nginx.conf.erb
  Diff comments   View file @5b40e9a
@@ -6,7 +6,7 @@ server { @@ -6,7 +6,7 @@ server {
6 listen *:8081; 6 listen *:8081;
7 7
8 server_name <%= node['config']['external_hostname'] %>; 8 server_name <%= node['config']['external_hostname'] %>;
9 - 9 + underscores_in_headers on;
10 access_log /var/log/nginx/gitlab.access.log; 10 access_log /var/log/nginx/gitlab.access.log;
11 error_log /var/log/nginx/gitlab.error.log; 11 error_log /var/log/nginx/gitlab.error.log;
12 12
cookbooks/noosfero/templates/nginx.conf.erb
  Diff comments   View file @5b40e9a
@@ -7,7 +7,7 @@ upstream noosfero { @@ -7,7 +7,7 @@ upstream noosfero {
7 server { 7 server {
8 listen *:8080; 8 listen *:8080;
9 server_name <%= node['config']['external_hostname'] %>; 9 server_name <%= node['config']['external_hostname'] %>;
10 - 10 + underscores_in_headers on;
11 access_log /var/log/nginx/noosfero.access.log; 11 access_log /var/log/nginx/noosfero.access.log;
12 error_log /var/log/nginx/noosfero.error.log; 12 error_log /var/log/nginx/noosfero.error.log;
13 13