Download as
Browse Code »

Commit 04363df88b386b0ef0048199f1b250e686cc031a

Authored by Charles Oliveira
Committed by Sergio Oliveira
1 parent 9c00ca85
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Readded Gitlab links 

Conflicts:
	src/templates/base.html
Showing 1 changed file with 15 additions and 1 deletions   Show diff stats
src/templates/base.html
  Diff comments   View file @04363df
... ... @@ -74,7 +74,21 @@
74 74 <li>
75 75 <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
76 76 </li>
77   -
  77 + {% if proxy.gitlab %}
  78 + <li class="dropdown">
  79 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Repository" %} <b class="caret"></b></a>
  80 + <ul class="dropdown-menu">
  81 + <li><a href="/gitlab/public/projects">{% trans "Public Projects" %}</a></li>
  82 + {% if user.is_active %}
  83 + <li><a href="/gitlab/profile">{% trans "Profile" %}</a></li>
  84 + <li><a href="/gitlab/projects/new">{% trans "New Project" %}</a></li>
  85 + <li><a href="/gitlab/dashboard/projects">{% trans "Projects" %}</a></li>
  86 + <li><a href="/gitlab/dashboard/issues">{% trans "Issues" %}</a></li>
  87 + <li><a href="/gitlab/dashboard/merge_requests">{% trans "Merge Requests" %}</a></li>
  88 + {% endif %}
  89 + </ul>
  90 + </li>
  91 + {% endif %}
78 92 {% if proxy.trac %}
79 93 <li class="dropdown">
80 94 <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Contribute" %} <b class="caret"></b></a>
... ...