Commit 8f0303c0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch '6-6-stable' of dev.gitlab.org:gitlab/gitlabhq

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
parents 0e45bf54 49464515
v 6.6.1
- Fix 500 error on files tab if submodules presents
v 6.6.0
- Retrieving user ssh keys publically(github style): http://__HOST__/__USERNAME__.keys
- Permissions: Developer now can manage issue tracker (modify any issue)
......
......@@ -196,7 +196,7 @@ class Repository
# # => git@localhost:rack.git
#
def submodule_url_for(ref, path)
if submodules.any?
if submodules(ref).any?
submodule = submodules(ref)[path]
if submodule
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment