Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
This commit is contained in:
commit
48443d20ca
114 changed files with 1524 additions and 1674 deletions
|
@ -6,7 +6,6 @@
|
|||
= favicon_link_tag 'favicon.ico'
|
||||
= stylesheet_link_tag "application"
|
||||
= javascript_include_tag "application"
|
||||
|
||||
-# Atom feed
|
||||
- if controller_name == 'projects' && action_name == 'index'
|
||||
= auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue