Commit Graph

493 Commits

Author SHA1 Message Date
Vokhmin Alexey V 90f6bca72d Merge branch 'master' into 369-bootstrap
Conflicts:
	Gemfile.lock
	app/models/concerns/feed/git.rb
	app/models/issue.rb
2014-11-08 01:09:32 +03:00
Vokhmin Alexey V f39c9e0bb5 #435: added filter by users and groups 2014-10-22 00:56:36 +04:00
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
Vokhmin Alexey V 5649e2e873 #435: added Statistic model 2014-10-06 23:16:12 +04:00
Vokhmin Alexey V 9afa84e8de #418: Added page for creation of builds for dependent projects 2014-07-23 22:02:51 +04:00
Alexander Machehin 202ac91644 [#369] change location in the tree page 2014-07-11 15:43:45 +06:00
Vokhmin Alexey V de2d08946f #405: updated UI, added extra_mass_builds to MassBuild 2014-06-27 23:08:14 +04:00
Vokhmin Alexey V 2c326e809e #408: added success list, refactoring 2014-06-26 21:20:26 +04:00
Vokhmin Alexey V 5404a7e75a #390: added specs 2014-05-22 22:08:43 +04:00
Vokhmin Alexey V 90f921e038 #390: added ability to rerun tests 2014-05-22 02:58:13 +04:00
Vokhmin Alexey V ea62617ed5 #388: Updated UI 2014-05-21 01:15:06 +04:00
Vokhmin Alexey V ac473294b7 #388: added angularjs controller 2014-05-17 01:53:04 +04:00
Alexander Machehin 015518d89c [#345] fix update commit 2014-04-15 15:14:58 +06:00
Vokhmin Alexey V cf479a144d ActiveAdmin integration 2014-04-12 00:29:43 +04:00
Vokhmin Alexey V c65853e072 #373: added ability to destroy ProductBuildList 2014-04-09 22:44:19 +04:00
Vokhmin Alexey V 35a2be81cf #373: rollback changes 2014-04-09 01:07:50 +04:00
Vokhmin Alexey V 7d0b2998dc #373: refactoring, added specs 2014-04-08 01:30:01 +04:00
avokhmin 4c74c31a4b Merge pull request #371 from abf/rosa-build:370-update-sitemap
#370: Update sitemap
2014-03-31 23:41:06 +04:00
Vokhmin Alexey V b1e98bd92f Fixed: confirmation_instructions 2014-03-31 14:25:56 +04:00
Vokhmin Alexey V e367a5e0dd #370: generate sitemap 2014-03-29 02:14:37 +04:00
Vokhmin Alexey V cab3debd4a Fixed: sign_up 2014-03-27 18:25:15 +04:00
Alexander Machehin c87c150bcd Merge branch '345-update_to_rails4' of abf.rosalinux.ru:abf/rosa-build into 345-update_to_rails4
Conflicts:
	config/routes.rb
2014-03-26 01:20:37 +06:00
Alexander Machehin 36d61d2e08 [#345] old route constraint 2014-03-26 01:14:27 +06:00
Alexander Machehin 5a02ed077b [#345] remove unneeded constraint 2014-03-26 00:44:06 +06:00
Vokhmin Alexey V f254b4d0a2 #345: updated routes.rb 2014-03-24 22:30:12 +04:00
Vokhmin Alexey V c4a4b50450 #345: updated route for publishing build_list 2014-03-24 21:54:05 +04:00
Alexander Machehin 9158a9ddf0 [#345] fix get_list route 2014-03-20 23:29:19 +06:00
Vokhmin Alexey V c0d5c6ec88 #345: fixed groups/profile_controller 2014-03-20 03:00:16 +04:00
Alexander Machehin d7a3f629e8 [#345] replace owner_with_name to name_with_owner 2014-03-19 13:19:03 +06:00
Vokhmin Alexey V e6934057b4 #345: updated routes, fixed specs 2014-03-17 21:01:17 +04:00
Vokhmin Alexey V c06245aa9f #345: fixed some specs, build_list_observer 2014-03-15 02:54:04 +04:00
Alexander Machehin 718c8bb08c [#345] remove url_for hack 2014-03-13 22:35:00 +06:00
Alexander Machehin bdcbc7e837 [#345] change devise routes 2014-03-12 21:59:57 +06:00
Alexander Machehin a5f56bb835 [#345] remove observers; use new labmda syntax 2014-03-11 14:28:17 +06:00
Alexander Machehin 636ae022bf [#247] remove private users 2014-03-06 17:24:33 +06:00
Vokhmin Alexey V e1260ea40b Merge branch 'master' into 354-add-possibility-to-rebuild-projects-periodically 2014-02-19 13:41:23 +04:00
Alexander Machehin bbaa67d674 [#356] fix changing the update type of the build list 2014-02-19 14:24:15 +06:00
Vokhmin Alexey V 93885af29a #354: updated UI 2014-02-18 23:16:23 +04:00
Vokhmin Alexey V a35448a210 Generate list with tests failed build_lists 2014-02-03 19:32:31 +04:00
Alexander Machehin 0e39aae1bf [#343] use new ruby hash syntax 2014-01-21 10:51:49 +06:00
Vokhmin Alexey V e98624ec41 #341: added new action #packages into Repository API 2014-01-21 01:24:22 +04:00
Alexander Machehin 0cb585ef71 Merge branch 'master' into 29-migrate-to-ruby-2.1
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/activity_feeds_controller.rb
	app/models/activity_feed_observer.rb
	config/environments/development.rb
	config/initializers/a_app_config.rb
	config/initializers/airbrake.rb
	lib/modules/models/git.rb
	spec/controllers/activity_feeds_controller_spec.rb
	spec/helpers/activity_feeds_helper_spec.rb
2014-01-10 08:31:31 +06:00
avokhmin ccdf15bcad Merge pull request #326 from abf/rosa-build:325-fork_project_with_another_name
#325 fork project with another name
2013-11-20 14:58:00 +04:00
Alexander Machehin 6932420678 Merge branch 'master' into 325-fork_project_with_another_name
Conflicts:
	app/controllers/projects/projects_controller.rb
2013-11-19 17:18:30 +06:00
Alexander Machehin 188c3be355 [#325] add abibity to create fork with different name 2013-11-19 17:06:44 +06:00
Vokhmin Alexey V 0d247779b7 #322: updated routes.rb 2013-11-18 22:12:50 +04:00
Vokhmin Alexey V dbf3f24b21 #321: added UI for mass_import 2013-11-14 02:01:12 +04:00
Vokhmin Alexey V 578c868ba1 #319: fixed routes errors 2013-11-12 21:13:05 +04:00
Vokhmin Alexey V a7e908b102 #319: Added ability to mass adding projects to the repository 2013-11-12 16:04:40 +04:00
Vokhmin Alexey V 9d70588da9 #312: updated routes 2013-11-09 01:15:22 +04:00