#258: removed backbone gem, small JS changes
This commit is contained in:
parent
4f8e7ab71e
commit
e63592e6ac
2
Gemfile
2
Gemfile
|
@ -51,7 +51,6 @@ gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags'
|
|||
gem "haml-rails", '~> 0.3.4'
|
||||
gem 'jquery-rails', '~> 2.0.2'
|
||||
gem 'ruby-haml-js', '~> 0.0.3'
|
||||
gem 'rails-backbone', '~> 0.7.2'
|
||||
|
||||
gem 'rack-throttle'
|
||||
gem 'rest-client', '~> 1.6.6'
|
||||
|
@ -60,6 +59,7 @@ gem 'attr_encrypted', '1.2.1'
|
|||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
|
||||
|
||||
# AngularJS related stuff
|
||||
gem 'underscore-rails'
|
||||
gem 'angularjs-rails'
|
||||
gem 'ng-rails-csrf'
|
||||
gem 'momentjs-rails'
|
||||
|
|
|
@ -114,7 +114,6 @@ GEM
|
|||
warden (~> 1.2.1)
|
||||
diff-display (0.0.1)
|
||||
diff-lcs (1.1.3)
|
||||
ejs (1.0.0)
|
||||
encryptor (1.1.3)
|
||||
erubis (2.7.0)
|
||||
escape_utils (0.2.4)
|
||||
|
@ -274,10 +273,6 @@ GEM
|
|||
activesupport (= 3.2.13)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.13)
|
||||
rails-backbone (0.7.2)
|
||||
coffee-script (~> 2.2.0)
|
||||
ejs (~> 1.0.0)
|
||||
railties (>= 3.1.0)
|
||||
rails3-generators (1.0.0)
|
||||
railties (>= 3.0.0)
|
||||
rails3-jquery-autocomplete (1.0.11)
|
||||
|
@ -407,6 +402,7 @@ GEM
|
|||
uglifier (1.2.7)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.3)
|
||||
underscore-rails (1.5.1)
|
||||
unicorn (4.3.1)
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
|
@ -477,7 +473,6 @@ DEPENDENCIES
|
|||
pg (~> 0.14.0)
|
||||
rack-throttle
|
||||
rails (= 3.2.13)
|
||||
rails-backbone (~> 0.7.2)
|
||||
rails3-generators
|
||||
rails3-jquery-autocomplete (~> 1.0.7)
|
||||
rake
|
||||
|
@ -504,6 +499,7 @@ DEPENDENCIES
|
|||
trinidad (~> 1.0.2)
|
||||
turbo-sprockets-rails3
|
||||
uglifier (~> 1.2.4)
|
||||
underscore-rails
|
||||
unicorn (~> 4.3.1)
|
||||
whenever (~> 0.7.3)
|
||||
wikicloth
|
||||
|
|
|
@ -26,7 +26,7 @@ RosaABF.controller('BuildListController', ['$scope', '$http', function($scope, $
|
|||
|
||||
$scope.updateTypeChanged = function() {
|
||||
if (_.indexOf($scope.advisoriable_types, $scope.build_list.update_type) != -1) {
|
||||
if ($scope.advisory) { $scope.search(); }
|
||||
if ($scope.advisory || $scope.term.length > 0) { $scope.search(); }
|
||||
} else {
|
||||
$scope.attach_advisory = 'no';
|
||||
}
|
||||
|
|
|
@ -9,10 +9,6 @@
|
|||
//= require_tree ./lib
|
||||
|
||||
//= require underscore
|
||||
//= require backbone
|
||||
//= require backbone_rails_sync
|
||||
//= require backbone_datalink
|
||||
//= require backbone/rosa
|
||||
|
||||
//= require js-routes
|
||||
// require angular
|
||||
|
|
|
@ -173,7 +173,7 @@ class Ability
|
|||
cannot [:create, :update, :destroy, :clone], Product, :platform => {:platform_type => 'personal'}
|
||||
cannot [:clone], Platform, :platform_type => 'personal'
|
||||
|
||||
# cannot :publish, BuildList, :new_core => false
|
||||
cannot :publish, BuildList, :new_core => false
|
||||
cannot :create_container, BuildList, :new_core => false
|
||||
cannot(:publish, BuildList) {|build_list| !build_list.can_publish? }
|
||||
|
||||
|
|
Loading…
Reference in New Issue