Commit Graph

49 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 fd214e656b #435: display statistics by commits 2014-10-17 23:14:42 +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 0f5e1f8548 #435: cleanup, refactoring, updated locales 2014-10-14 00:21:32 +04:00
Alexander Machehin f0fe50f033 fix a mass projects import 2014-10-06 18:10:45 +06:00
Vokhmin Alexey V 610a995597 #432: cleanup, updated UI, specs 2014-10-02 00:10:05 +04:00
Vokhmin Alexey V 310eb0ec38 #432: added CreateEmptyMetadataJob 2014-10-01 00:05:53 +04:00
Vokhmin Alexey V 3d444f3b91 Merge branch 'master' into 416-handle-ExcludeArch-and-ExclusiveArch-tags 2014-09-22 23:35:38 +04:00
Alexander Machehin f2cb314ba6 fix saving build list duration time 2014-08-29 16:40:01 +06:00
Vokhmin Alexey V 6fb8fb92c4 Fixed: save #started_at at starting of build 2014-08-20 22:16:15 +04:00
Vokhmin Alexey V 6f97b8dc15 #416: Handle ExcludeArch and ExclusiveArch tags 2014-07-23 02:43:50 +04:00
Alexander Machehin 66e21de2b7 [#369] add tree content pagination 2014-07-09 15:38:36 +06:00
Vokhmin Alexey V 3d08c050ad #403: refactoring of file_store_clean 2014-06-20 22:40:18 +04:00
Vokhmin Alexey V 4a40764173 #403: move abf_worker/*_observer to app/jobs/abf_worker/ 2014-06-20 22:02:32 +04:00
Vokhmin Alexey V 32c03780ba Fixed: undefined method project for "AR:Issue:":String 2014-06-18 22:32:17 +04:00
Alexander Machehin aa959496c9 Merge branch 'master' into 369-bootstrap
Conflicts:
	app/views/projects/build_lists/show.html.haml
	app/views/shared/_build_results.html.haml
2014-06-02 19:46:58 +06:00
Alexander Machehin 91dc74e73f [#369] add missing templates; fix activity feed; add truncation to activity text 2014-05-06 18:58:10 +06:00
Vokhmin Alexey V acc9b522db Use FileStore for build scripts 2014-05-03 00:38:28 +04:00
Alexander Machehin 67031c06f8 Merge branch 'master' into 369-bootstrap
Conflicts:
	config/environments/production.rb
2014-04-21 15:16:30 +06:00
Alexander Machehin 1aceaff1b8 fix wiki creating notification 2014-04-17 17:25:02 +06:00
Vokhmin Alexey V 44ac1056ab #376: updated priority of queues 2014-04-15 22:41:06 +04:00
Alexander Machehin 1a1838a363 [#369] add templates; add codemirror 2014-04-11 14:57:00 +06:00
Alexander Machehin 5cf413139d [#369] increase truncate length activity commit messages 2014-04-08 19:08:22 +06:00
Alexander Machehin 3ad56a80ff [#369] fix error with truncate method 2014-04-08 19:04:25 +06:00
Alexander Machehin cb45fe6aed [#369] truncate activity comment body 2014-04-08 18:59:59 +06:00
Alexander Machehin 54ce497e61 [#369] truncate activity commit messages 2014-04-08 18:59:16 +06:00
Vokhmin Alexey V 4087f4c94a #345: rollback changes 2014-03-27 01:12:56 +04:00
Vokhmin Alexey V a15353e460 #345: fixed: usage of name_with_owner 2014-03-27 00:02:28 +04:00
Vokhmin Alexey V 237df48f94 Merge branch '345-update_to_rails4' of abf.rosalinux.ru:abf/rosa-build into 345-update_to_rails4 2014-03-25 22:03:08 +04:00
Vokhmin Alexey V b85d6c4c2d #345: fixed auntification by token 2014-03-25 22:02:53 +04:00
Alexander Machehin 2d8a2bdc7c [#345] fix mistype 2014-03-25 23:34:04 +06:00
Alexander Machehin f9b298b8e8 [#345] fix wiki path 2014-03-21 16:41:35 +06:00
Vokhmin Alexey V 4d7809ec14 #345: rollback changes, added test_after_commit gem 2014-03-20 02:35:59 +04:00
Vokhmin Alexey V ee412382f0 #345: fixed state_machine 2014-03-20 02:01:42 +04:00
Vokhmin Alexey V 50a301d2fa #345: updated comments_controller_spec 2014-03-19 03:00:29 +04:00
Alexander Machehin 2ee3ea93bd [#345] remove deprecated dynamic finder methods 2014-03-18 19:58:51 +06:00
Alexander Machehin 83010eca32 [#345] fix specs; fix project url; fix missing method error 2014-03-18 15:39:58 +06:00
Alexander Machehin 4cf3e931bd [#345] fix relations create; refactoring specs; remove unneded files 2014-03-18 15:31:18 +06:00
Vokhmin Alexey V c672aaa0ec #345: fixed some specs, etc 2014-03-18 00:18:46 +04:00
Vokhmin Alexey V c06245aa9f #345: fixed some specs, build_list_observer 2014-03-15 02:54:04 +04:00
Alexander Machehin 8ff7ae6870 [#345] temporaly fix error with mass-assign protected attributes 2014-03-13 16:43:04 +06:00
Alexander Machehin f05f0e1d72 [#345] fix activity concern 2014-03-11 19:44:30 +06:00
Alexander Machehin ef63ddcaac [#345] fix mistypes 2014-03-11 17:47:03 +06:00
Alexander Machehin 775ab380a2 [#345] move markdown to helper 2014-03-11 15:55:42 +06:00
Alexander Machehin 0a7d5d22da [#345] move lib/modules/models to app/models/concerns; small refactoring 2014-03-11 14:58:36 +06:00
Alexander Machehin a5f56bb835 [#345] remove observers; use new labmda syntax 2014-03-11 14:28:17 +06:00
Vokhmin Alexey V d317eeb413 #281: moved concerns into lib folder 2013-08-27 20:27:22 +04:00
Vokhmin Alexey V a51b1e0e9f #281: Show repodata creation logs 2013-08-27 19:43:30 +04:00
Vokhmin Alexey V 55bc1a8096 #276: updated UI of platforms, some refactoring 2013-08-23 22:58:29 +04:00