Download as
Browse Code »

Commit 06c65fedcd40d0e7f83b5d017c47e7194492966e

Authored by Carlos Coêlho
2 parents fb3dd9c7 719e4aab
Exists in master and in 18 other branches add_sisp_to_chef, add_super_archives_plugin, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, fix_breadcrumbs_position, fix_categories_software_link, fix_list_style_on_folder_elements, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, lxc_settings, mezuro_cookbook, refactor_download_block, software_communities_html_refactor, spb_to_rails4, stable-4.2, update_search_by_categories

Merge branch 'gitlab_merge_url_fix' into 'master' 

Gitlab merge url fix

See merge request !168
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
cookbooks/colab/templates/gitlab.py.erb
  Diff comments   View file @06c65fe
@@ -35,7 +35,7 @@ menu_urls = ( @@ -35,7 +35,7 @@ menu_urls = (
35 url(display=_('Issues'), viewname='gitlab', 35 url(display=_('Issues'), viewname='gitlab',
36 kwargs={'path': 'dashboard/issues'}, auth=True), 36 kwargs={'path': 'dashboard/issues'}, auth=True),
37 url(display=_('Merge Requests'), viewname='gitlab', 37 url(display=_('Merge Requests'), viewname='gitlab',
38 - kwargs={'path': 'merge_requests'}, auth=True), 38 + kwargs={'path': 'dashboard/merge_requests'}, auth=True),
39 39
40 ) 40 )
41 41