Download as
Browse Code »

Commit 6e6cfdb27cdd517451a877b18cd98bf9e5bde60b

Authored by Rafael Manzo
Committed by Paulo Meireles
1 parent b6e9f46e
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[Mezuro] Merge error between the branchs mezuro e history_view fixed inside the controller

Showing 1 changed file with 0 additions and 1 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @6e6cfdb
... ... @@ -40,7 +40,6 @@ class MezuroPluginProfileController < ProfileController
40 40 source_tree = project_result.node_of(params[:module_name])
41 41 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
42 42 end
43   -
44 43 def choose_base_tool
45 44 @configuration_name = params[:configuration_name]
46 45 @tool_names = Kalibro::Client::BaseToolClient.new
... ...