From 43a22b72d847c6a76cbbca4c4801185cf87c8043 Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Wed, 5 Oct 2011 14:58:25 +0400 Subject: [PATCH] Get rid of vksearch submodules --- .gitmodules | 6 ------ app/controllers/artist_controller.rb | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 975df7c..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "app/assets/javascripts/jquery/jplayer"] - path = app/assets/javascripts/jquery/jplayer - url = https://github.com/happyworm/jPlayer.git -[submodule "app/assets/javascripts/vksearch"] - path = app/assets/javascripts/vksearch - url = git@github.com:magnolia-fan/vkontakte_music_search.git diff --git a/app/controllers/artist_controller.rb b/app/controllers/artist_controller.rb index c09a22f..247a3cf 100644 --- a/app/controllers/artist_controller.rb +++ b/app/controllers/artist_controller.rb @@ -81,7 +81,7 @@ class ArtistController < ApplicationController pic: artist.pic_url, urls: artist.artist_links } - ap artist.artist_links + media_types = @@default_album_types session = Session.find_by_key(session_key) unless session.nil?