diff --git a/config.rb b/config.rb index eb15afb..d0b13e5 100644 --- a/config.rb +++ b/config.rb @@ -56,7 +56,7 @@ set :images_dir, 'images' # Build-specific configuration configure :build do # For example, change the Compass output style for deployment - activate :minify_css + # activate :minify_css # Minify Javascript on build activate :minify_javascript @@ -70,3 +70,12 @@ configure :build do # Or use a different image path # set :http_prefix, "/Content/images/" end + +activate :deploy do |deploy| + deploy.method = :git + # Optional Settings + # deploy.remote = 'custom-remote' # remote name or git url, default: origin + # deploy.branch = 'custom-branch' # default: gh-pages + # deploy.strategy = :submodule # commit strategy: can be :force_push or :submodule, default: :force_push + # deploy.commit_message = 'custom-message' # commit message (can be empty), default: Automated commit at `timestamp` by middleman-deploy `version` +end \ No newline at end of file diff --git a/source/javascripts/all.js b/source/javascripts/all.js index 124ca27..cd23351 100644 --- a/source/javascripts/all.js +++ b/source/javascripts/all.js @@ -1,7 +1,7 @@ //= require_tree . angular.module('theme', []) - .controller('ThemeController', function($scope) { + .controller('ThemeController', ['$scope', function($scope) { $scope.$watch( function() { return $scope.theme; }, function(theme) { @@ -15,4 +15,4 @@ angular.module('theme', []) $scope.active_presence = parts[6]; $scope.mention_badge = parts[7]; }); - }); + }]);