Commit Graph

1356 Commits

Author SHA1 Message Date
Vladimir Sharshov 224ce4ec8d Merge pull request #137 from warpc/95-upgrade_ruby
Upgrade ruby and fix bugs (Refs #95)

* Upgrade to ruby 1.9.3 and fix bugs
* Fix bug with commit_hash save during project build
* Move some russian text to yml
* Code cleanup
* Fix templates, deploy and import scripts
* Fix specs
* Translate event_logs
* Add magic encodings
* Fix staging deploy
2012-01-30 13:28:18 -08:00
George Vinogradov 07e71c2dfc [issue #64] Changed find_by to where 2012-01-31 01:20:03 +04:00
Pavel Chipiga 61647e4d1b Do not store .rvmrc. Refs #95 2012-01-30 23:09:24 +02:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Pavel Chipiga 33dce21312 Upgrade to ruby 1.9.3 and fix bugs. Fix bug with commit_hash save during project build. Move some russian text to yml. Code cleanup. Fix templates, deploy and import scripts. Fix specs. Translate event_logs. Refs #95 2012-01-30 22:36:58 +02:00
Pavel Chipiga 5126aa796c Ensure import branch always exists. Refs #112 2012-01-30 18:23:10 +02:00
George Vinogradov 2a27cd3662 [issue #64] Some fixes. 2012-01-30 19:27:54 +04:00
George Vinogradov 5f40030e30 [issue #64] Fixed bug with cloning wiki repository 2012-01-30 18:17:00 +04:00
Alexander Machehin 119c378149 [refs #114] change subsrcibe status to boolean 2012-01-30 17:59:57 +06:00
George Vinogradov 2f315f869d [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	db/schema.rb
2012-01-30 13:27:22 +04:00
George Vinogradov f7c58f6a77 [issue #64] Removed unnecessary files. 2012-01-30 13:12:18 +04: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 8962e85b2d [refs #114] fix reverting 2012-01-30 12:38:31 +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
Alexander Machehin f6b6bbfb54 Revert "[refs #114] emails control"
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.

Conflicts:

	app/models/subscribe.rb
	app/models/user.rb
	spec/models/comment_for_commit_spec.rb
2012-01-30 12:19:54 +06:00
Alexander Machehin dc39eefe62 Revert "[refs #114] add js"
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
2012-01-30 12:16:09 +06:00
Alexander Machehin ea7cbe1908 Revert "[refs #114] fix emails uniqueness"
This reverts commit bc9649561f5b8ac58f9b27d31d66365f16d0cce0.

Conflicts:

	app/models/subscribe.rb
	app/models/user_email.rb
2012-01-30 12:15:33 +06:00
Alexander Machehin 255c39ef5a Revert "Merge branch 'fix-email-i18n' into 114-comment_notifications"
This reverts commit 9bf06e5e1a595f320dc4527ebd44f14be05fcd64, reversing
changes made to f2bc0e67a91e6283f4881e754e5da95c59cf341b.
2012-01-30 12:09:52 +06:00
Alexander Machehin 2e2e7e43d3 [refs #114] some refactoring 2012-01-30 02:18:14 +06:00
George Vinogradov 706c052a5e [issue #64] User names are clickable. 2012-01-29 22:03:42 +04:00
George Vinogradov 1ef2bc0f75 [issue #64] Actions authorization moved to filters 2012-01-29 22:02:18 +04:00
Alexander Machehin 39a4479fa3 [refs #114] fix emails uniqueness 2012-01-29 22:27:46 +06:00
George Vinogradov 12ceace1f1 [issue #64] Fixed some localization typos. 2012-01-28 16:15:09 +04:00
George Vinogradov acdd1f22b6 [issue #64] Fixed bug with revert all wiki. 2012-01-28 16:10:43 +04:00
George Vinogradov 98e1696fd2 [issue #64] Fixed mistake in schema.rb 2012-01-28 16:10:18 +04:00
Pavel Chipiga 95b566dc10 Bugfix. Refs #112 2012-01-28 06:22:29 +02:00
Pavel Chipiga 205320c200 Fix log path. Refs #112 2012-01-28 05:09:39 +02:00
Pasha cd41980441 Merge pull request #135 from warpc/112-sync_projects
Доработки автоматической синхронизации
2012-01-27 18:38:31 -08:00
Pavel Chipiga a1d7ee10e9 Redo indexes to schema_plus. Refs #112 2012-01-28 04:29:33 +02:00
Pavel Chipiga 43a4aecc66 Change indexes to composite, unique, case insensitive. Redo sync logging. Verbose params for tasks. Refs #112 2012-01-28 04:05:31 +02:00
George Vinogradov aa5641da2f [issue #64] Fixed CanCan bugs. 2012-01-28 06:05:13 +04:00
George Vinogradov 2ab039cc62 [issue #64] Some fixes in view. 2012-01-28 05:56:27 +04:00
George Vinogradov 7974893e01 [issue #64] Fixed bug with links in markdown. 2012-01-28 05:41:28 +04:00
Pavel Chipiga fab4aa6eb6 Refactor and fix projects by_name scope. Apply case insensitive projects, repositories and platforms name uniqness validation. Apply case insensitive project search fallback. Redirect import task outnput to log file. Rename all task. Refs #112 2012-01-28 03:04:11 +02:00
Vladimir Sharshov f9abc2d39c Hide participate projects 2012-01-28 04:25:11 +04:00
Vladimir Sharshov 0c0e131c98 Add pid path for new relic monitoring service 2012-01-28 03:06:08 +04:00
Vladimir Sharshov 09e5a1e4d6 Add NewRelic monitoring to autostart and watching 2012-01-28 02:56:52 +04:00
George Vinogradov a89db6f3a5 [issue #64] Fixed bug with multiword page names 2012-01-27 23:14:53 +04:00
George Vinogradov 324e9a294f [issue #64] Fixed some bugs. 2012-01-27 22:30:45 +04:00
George Vinogradov a4f95e3660 [issue #64] Changed editor toolbar. 2012-01-27 21:00:44 +04:00
George Vinogradov 6739d94e11 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-01-27 20:51:42 +04:00
George Vinogradov 9caf496454 [issue #64] Added missing translations. 2012-01-27 20:48:48 +04:00
Vladimir Sharshov e966e523e9 Merge pull request #132 from warpc/112-sync_projects
Auto sync for mandriva repo

* 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
2012-01-27 08:46:58 -08: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 7cc354f4d7 Merge branch '64-project_wiki' of github.com:warpc/rosa-build into 64-project_wiki 2012-01-27 21:24:56 +06:00
Alexander Machehin 5caabac555 [refs #64] fix hide gollum-dialog 2012-01-27 21:19:57 +06:00
George Vinogradov 0cacdc9d4a [issue #64] Fixed bug in migration 2012-01-27 18:38:33 +04:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
2012-01-27 18:27:23 +04:00
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
George Vinogradov eed3040944 [issue #64] Changed validation message and removed unnecessary
validation of projects owner.
2012-01-27 10:13:56 +04:00