Commit Graph

133 Commits

Author SHA1 Message Date
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications
Conflicts:
	config/locales/ru.yml
2012-01-31 21:42:37 +06:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin 5efaca77cf Merge branch 'master' into 114-comment_notifications
Conflicts:
	app/models/project.rb
	app/views/user_mailer/new_comment_notification.en.haml
	app/views/user_mailer/new_comment_notification.ru.haml
	app/views/user_mailer/new_comment_reply_notification.ru.haml
	config/locales/devise.en.yml
	config/locales/en.yml
	config/locales/ru.yml
	db/schema.rb
2012-01-30 13:06:06 +06:00
Alexander Machehin e0b7699ffd Revert "Merge branch '114-comment_notifications' into user-emails-list"
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.

Conflicts:

	app/models/user.rb
2012-01-30 12:22:54 +06:00
Pavel Chipiga 74f891fc83 Apply rsync for mandriva repo. Parse and import changes from official repo. Fix attachment types. Redo srpm upload wrapper to use it without paperclip. Add cron task through whenever. Refs #112 2012-01-27 17:35:18 +02:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
Pavel Chipiga f8be867aaf Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103 2012-01-17 19:37:41 +02:00
santaux 62d0419bdd Merge pull request #106 from warpc/103-bl_publish_new_params
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
Pavel Chipiga a687a6601b Save commit_hash during build_list create. Tag git repo during build_list publish. Write and fix specs. Refs #103 2012-01-16 23:51:20 +02:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar 402133aff6 [refs #54] Add some subscribe specs and factory 2011-12-29 21:03:53 +04:00
konstantin.grabar 635e2b7977 [refs #54] Add comments specs and factory. Remove unused code. Add one delay and fix some links. 2011-12-29 15:16:54 +04:00
konstantin.grabar a783b460bd Merge issues with master 2011-12-28 13:22:57 +04:00
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +04:00
Pavel Chipiga 7d3dd5eaf1 [#82] Merge branch 'master' into 65-build_repo
Conflicts:
	spec/models/cancan_spec.rb
2011-12-26 14:51:30 +02:00
konstantin.grabar 894bc0c077 [refs #54] Add issues tests. Fix some CanCan rights. Make some fixes to logic 2011-12-23 14:56:46 +04:00
Pavel Chipiga 8c3291d237 Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65 2011-12-23 04:14:28 +02:00
konstantin.grabar d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +04:00
Pavel Chipiga 0ca7c5d451 Rename bs_id label and key. Stub XML RPC to raise exception and fix spec. Write specs for build_lists filters. Refs #2 2011-12-08 20:51:25 +02:00
George Vinogradov 26689f3bd2 Start writing Group tests. 2011-12-07 23:51:08 +04:00
konstantin.grabar eed248676d [refs #2249] Add personal repositories specs. Correct perosnal repository factory 2011-11-30 13:53:53 +04:00
konstantin.grabar e92f633124 [refs #2249] Add repositories specs. Fixes perosonal repo factory 2011-11-29 21:45:03 +04:00
konstantin.grabar ff9bfa3f9d [refs #2249] Add corrections to rspec controllers tests 2011-11-29 18:36:51 +04:00
Pavel Chipiga 02a813a474 Upgrade rails, devise and other gems. Refactor controllers. Fix application.yml config - remove unused keys and setup correct values for tests. Add product build lists status_build callback auth. Allow platform and project unixname uppercase. Write tests and fix bugs for ProductBuildList controller. Fix all unresolved test problems. Refs #2262 2011-11-26 02:54:40 +02:00
konstantin.grabar 97e4a7d26d [refs #2249] Finished CanCan models tests. Add new factories 2011-11-23 22:12:55 +04:00
konstantin.grabar fc3c6a05c9 [refs #2249] CanCan tests 2011-11-22 23:21:31 +04:00
Timothy N. Tsvetkov 3b51d53225 freeze + spec 2011-03-17 17:47:16 +03:00
Timothy N. Tsvetkov a655d0eb6b sequences for the factory girl 2011-03-17 17:03:02 +03:00