Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
rosa-build/app/controllers/platforms
History
Alexander Machehin 2b9434f346 Merge branch 'master' into 369-bootstrap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/angular-new/models/build_list.js.erb
	app/assets/javascripts/extra/build_list.js
	app/controllers/projects/build_lists_controller.rb
	app/controllers/projects/projects_controller.rb
	app/models/platform.rb
	app/views/projects/base/_layout.html.haml
	app/views/projects/build_lists/_new_form.html.haml
	app/views/projects/build_lists/show.html.haml
	app/views/projects/git/base/_fork.html.haml
	app/views/projects/git/commits/_commits.html.haml
	config/locales/en.yml
	config/locales/ru.yml
 		2014-10-16 16:41:29 +06:00
..
base_controller.rb #29: removed hack for encoding 2013-03-18 15:36:16 +04:00
contents_controller.rb #388: added specs 2014-05-21 01:43:22 +04:00
key_pairs_controller.rb [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
maintainers_controller.rb [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
mass_builds_controller.rb fix error "undefined method map for nil:NilClass" 2014-08-28 19:23:41 +06:00
platforms_controller.rb [#369] projects page; small refactoring 2014-06-26 18:07:22 +06:00
product_build_lists_controller.rb update rescue from the product log highlight 2014-10-08 19:03:09 +06:00
products_controller.rb [#345] remove url_for hack 2014-03-13 22:35:00 +06:00
repositories_controller.rb #405: cleanup 2014-06-27 01:26:26 +04:00
tokens_controller.rb [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00