Commit Graph

524 Commits

Author SHA1 Message Date
Pavel Chipiga b47b4ec075 Update rails and gems. Redo resque jobs enqueue and perform through plugins. Redo emails async sending. Redo hook process. Refactor and code cleanup. Refs #510 2012-06-16 21:27:46 +03:00
konstantin.grabar 8eaec85aff [refs #442] Fix auto_publish validate and default set 2012-05-29 17:44:30 +04:00
Alexander Machehin 11c67fb07d Revert "[refs #90] issue status -> state" & changed state -> status
This reverts commit 7470ee76e4783a0fbbd98607406d7b770a2980d1.

Conflicts:

	app/controllers/projects/issues_controller.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
2012-05-29 16:50:25 +06:00
konstantin.grabar a79d946b6b [refs #442] Mass build refactor and fixes 2012-05-25 19:56:26 +04:00
konstantin.grabar 45ff187875 [refs #442] Remove button. Add tab. Fix locales. Fix schema 2012-05-23 20:44:04 +04:00
konstantin.grabar c74de8b84d [refs #442] Add new page for mass rebuild, new fields and new functional 2012-05-23 18:08:11 +04:00
konstantin.grabar 9aefce6b68 [refs #442] Merge master into 442-mass_build 2012-05-21 18:33:12 +04:00
konstantin.grabar b85cb31b88 [refs #442] Remove def is_rpm. Change auto_publish default value. Change MassBuild set_name. Fix schema 2012-05-21 17:59:04 +04:00
Alexander Machehin 6b6887250b Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-05-21 17:31:49 +06:00
konstantin.grabar cd3564bb81 [refs #442] Add mass build model and new build_all fixes 2012-05-18 19:12:51 +04:00
Alexander Machehin fcffff4178 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	config/locales/title.en.yml
	config/locales/title.ru.yml
	config/routes.rb
	db/schema.rb
2012-05-17 22:58:29 +06:00
konstantin.grabar ec9c19352e [refs #461] Merge master into to 461-rename_is_rpm_to_is_package. Again 2012-05-17 12:00:21 +04:00
Vladimir Sharshov 1550d7a59e Merge pull request #459 from warpc/438-remove_rsync_mount_from_app
[refs #438] Remove rsync mount and umount from platforms
2012-05-16 06:24:31 -07:00
konstantin.grabar 208310e83b [refs #438] Add rake task to symlink migrate. Change rsync stubs 2012-05-16 17:01:25 +04:00
konstantin.grabar 1385133ed5 [refs #461] Merge master into 461-rename_is_rpm_to_is_package 2012-05-16 14:37:35 +04:00
konstantin.grabar 79a9b3d107 [refs #461] Fix is_package locale. Fix schema.rb and rename migration 2012-05-16 14:33:14 +04:00
konstantin.grabar 1f088c0cfc [refs #461] Rename is_rpm to is_package 2012-05-15 14:00:57 +04:00
Pavel Chipiga 8470674c62 Apply basic build list packages store functionality. Display build list package content. Write specs. Refactor. Refs #444 2012-05-14 22:08:31 +03:00
Pavel Chipiga 52f5e01575 Fix build list controller bugs. Fix JS which controls checkboxes. Fix translations. Fix and refactor views. Refs #428 2012-05-06 00:43:04 +03:00
George Vinogradov 26a643eed1 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	db/schema.rb
2012-05-05 21:33:39 +04:00
Alexander Machehin 69303561f4 [refs #434] add build priority to users 2012-05-05 17:05:24 +06:00
George Vinogradov 8350fc8fb1 [issue 428] Added advisory. 2012-05-04 21:12:51 +04:00
Alexander Machehin 36b4ce2d99 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/projects/issues_controller.rb
	app/models/project.rb
	config/locales/menu.en.yml
	config/routes.rb
	db/schema.rb
2012-05-03 23:19:43 +06:00
Alexander Machehin 9e5db741d3 Merge branch 'master' into 90-pull
Conflicts:
	app/models/project.rb
	db/schema.rb
2012-05-02 23:08:24 +06:00
Pavel Chipiga b957600eda Merge branch 'master' into 263-refactoring
Conflicts:
	app/models/project.rb
	app/views/projects/_repo_block.html.haml
	db/schema.rb
	spec/controllers/issues_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
2012-05-01 15:54:13 +03:00
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06:00
Vladimir Sharshov 77414b3092 Universal mass rebuildfor platform onwer without hardcoded main repository or architecture 2012-04-26 13:18:11 +04:00
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in
EventLog
2012-04-26 05:38:33 +04:00
Alexander Machehin 628fed40ea [refs #90] issue status -> state 2012-04-23 23:34:11 +06:00
Alexander Machehin fda1a847f5 [refs #90] some tests and questions 2012-04-23 23:34:10 +06:00
Alexander Machehin 58776a6e9e [refs #90] fixing pull methods 2012-04-23 23:34:10 +06:00
Alexander Machehin 71fdaa4e4d [refs #90] initial 2012-04-23 23:34:10 +06:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
2012-04-23 17:58:45 +03:00
Alexander Machehin 37b98e3015 [refs #396] fixing rollback 2012-04-20 22:51:12 +06:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
konstantin.grabar 2fc4e2db61 [refs #396] Fix token migration. Fix atom link tag title 2012-04-19 14:50:43 +04:00
konstantin.grabar cd153375dd [refs #396] Devise token auth update for atom feed. Some atom feed fixes. 2012-04-18 19:15:04 +04:00
konstantin.grabar 3d1cb4bfee Merge master into 396-rss_atom_feed 2012-04-18 16:53:53 +04:00
konstantin.grabar 8ef020427d [refs #396] Add token auth for atom feed 2012-04-18 16:46:09 +04:00
Vladimir Sharshov dcdea4b8d3 [Refs #404] Remove downloads statistics functional (db and tests) 2012-04-17 17:56:44 +04:00
Vladimir Sharshov 44ca501962 [Refs #194] Fix tests
[Refs #263] Update kernel API call
2012-04-16 21:51:51 +04:00
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
Vladimir Sharshov 89756ded0c [Refs #223] Destroy non compatibility ActiveFeeds 2012-04-13 21:38:57 +04:00
Vladimir Sharshov 100a166699 [Refs #223] Refactoring for pull request 2012-04-13 17:24:43 +04:00
Vladimir Sharshov 36447051ec [Refs #223] Small refactoring for pull request 2012-04-13 13:48:57 +04:00
konstantin.grabar 742603ab7e [refs #223] Add build list duration 2012-04-12 14:29:04 +04:00
Pavel Chipiga a9ecc683f2 Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263 2012-04-05 20:11:02 +03:00
Pavel Chipiga 977ec8382c Merge branch 'master' into 263-refactoring 2012-04-05 19:58:46 +03:00
Vladimir Sharshov 4bb8a38fbb Merge pull request #376 from warpc/263-dj
[Refs #295] Customized DJ jobs and workers:
* set priority to delayed jobs;
* 4 workers to dj;
* division init bare & fork.
2012-04-05 06:54:28 -07:00
Pavel Chipiga 20e5936d0c Fix and refactor build lists, comments and other specs. Refactor comments controller, models and views. Code cleanup. Refs #263 2012-04-05 00:43:06 +03:00
Alexander Machehin 349e173f60 [refs #295] deploy recipes for dj 2012-04-04 23:00:35 +06:00
Vladimir Sharshov d382732e68 [Refs #263] Refactoring product. Add tests. 2012-04-03 16:21:39 +04:00
Vladimir Sharshov fef3affc07 [Refs #263] Refactoring platforms, add platform tests and software license, showing warning for errors in update project action 2012-04-01 19:19:54 +04:00
Pavel Chipiga d6e6959f46 Write basic robots.txt. Apply configurable anonymous access, hide some functionality from guests. Apply basic design for main page. Autoconfirm manually created users. Code refactor and cleanup. Remove unused code, routes, containers, rpms, personal_repositories. Redo product_build_lists monitoring and filtering. Fix add_project to repo bug. Add links to bottom menu. Switch off deploy assets sppedup. Refs #349, #263 2012-03-31 02:37:54 +03:00
Vladimir Sharshov 3cedef5f07 Merge branch 'master' into 344-fix_products_monitoring
Conflicts:
	db/schema.rb
2012-03-30 20:30:06 +04:00
Pavel Chipiga 531ba0a35f Add rspec to dev env, change repo source. Take back rails_datatables to plugins with all files. Refs #263 2012-03-30 00:24:57 +03:00
Pavel Chipiga 050398c39f Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-03-30 00:02:59 +03:00
Pavel Chipiga 583918fa68 Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263 2012-03-29 23:34:22 +03:00
Vladimir Sharshov 0c2d0f4612 [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00
Vladimir Sharshov 66c285c796 [Refs #263] Delete AutoBuildList 2012-03-29 22:22:48 +04:00
konstantin.grabar c6d30b7ff3 [refs #344] Add link to product into product build lists list 2012-03-28 17:51:04 +04:00
konstantin.grabar f33ef75666 [refs #128] Add email confirmation on email change. Remove email confirmation after registration. 2012-03-27 17:45:09 +04:00
konstantin.grabar 8b31c6373f Merge branch 'master' into 128-account-activation 2012-03-27 13:46:21 +04:00
konstantin.grabar ae0ca1ce99 [refs #128] Fix devise mails. Fix confirm ability 2012-03-26 18:33:02 +04:00
konstantin.grabar a3d334f0c2 [refs #128] Merge 3.2-master into 128-account-activation 2012-03-26 13:55:45 +04:00
Pavel Chipiga 4553affa56 Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134 2012-03-22 19:11:12 +02:00
konstantin.grabar 21c33b384b [refs #325] Add new design to error pages 2012-03-22 11:16:56 +04:00
Pavel Chipiga 2db7726d55 Merge branch '3.2-master' into 190-encodings
Conflicts:
	db/schema.rb
2012-03-22 00:13:18 +02:00
George Vinogradov b902d8effe [issue #195] Fixed avatar in commits & comments 2012-03-22 01:51:39 +04:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Pavel Chipiga 8b252d8c14 Add and tune devise lockable strategy. Refs #270 2012-03-21 15:37:16 +02:00
Vladimir Sharshov d3c3726a84 [Refs #66] Add priority in build list 2012-03-20 14:56:51 +04:00
George Vinogradov 3c60347a23 [issue #279] Fixes.
*  Almost finished permissions fixes
  *  Removed is_template from product
  *  Some fixes in crontab_generator partial
2012-03-15 03:34:09 +04:00
George Vinogradov 747edb73a5 [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
	db/schema.rb
2012-03-14 21:43:08 +04:00
Vladimir Sharshov 79e56eec52 Merge pull request #298 from warpc/265-activity_feed_messages
[Refs #265] Restyle comments and issues feeds messages, refactoring, fix bugs
2012-03-14 10:29:10 -07:00
George Vinogradov 5a77b17a43 [issue #279] Almost finished design for platforms
TODO:
  *  Add design for crontab generator
  *  Fix path generation
2012-03-14 21:22:47 +04:00
Alexander Machehin 3642163fd7 [refs #265] changed feed messages 2012-03-14 23:00:26 +06:00
Vladimir Sharshov 9f9eb23e43 Merge pull request #293 from warpc/265-new_design_for_activity_feed
[Refs #265] Fix subscribe dublicates
2012-03-13 13:48:32 -07:00
Alexander Machehin 5b932879e2 [refs #265] fixed subscribe dublicates 2012-03-13 19:56:58 +06:00
Pavel Chipiga cf009c7388 Fix routes. Refs #257 2012-03-12 22:34:42 +02:00
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Pavel Chipiga 41cd1ddaf3 Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195 2012-03-07 23:34:49 +02:00
George Vinogradov d6d8410b0f [issue #274] Fixed file detection.
TODO.

  1.  Change MIME in editor
  2.  Change MIME sorting
2012-03-07 05:20:35 +04:00
Alexander Machehin 7588a318da Merge branch '3.2-master' into 265-new_design_for_activity_feed
Conflicts:
	app/models/user.rb
2012-03-07 03:58:35 +06:00
Alexander Machehin 13ba125dc0 [refs #265] add project_id to comment & fix email notification 2012-03-07 03:49:29 +06:00
Pavel Chipiga 7308c4a0d2 Merge branch '3.2-master' into 255-search
Refactor avatars. Fix user bugs. Remove ssh_key delete migration

Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/user.rb
2012-03-06 20:59:29 +02:00
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar 9b68752ffd [refs #257] Change avatar helper and logic. Add paperclip avatar to users 2012-03-03 22:05:02 +04:00
konstantin.grabar f58e24b134 [refs #257] User edit pages fixes 2012-03-03 20:03:23 +04:00
konstantin.grabar 0dc22bae82 [refs #257] Add new design for users edit and private settings edit. Add new fields and action. 2012-03-03 12:01:32 +04:00
Pavel Chipiga 159fbe65dc Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
2012-03-03 01:38:43 +02:00
konstantin.grabar e147c2d6c5 [refs #257] Add new design for user public page. New field. Move locales to another file 2012-03-02 16:14:59 +04:00
konstantin.grabar 8677fa7493 [refs #232] Remove name field 2012-03-02 14:39:48 +04:00
konstantin.grabar 1700588b97 [refs #232] Merge 3.2-master into 232-new_groups_design 2012-03-02 13:44:54 +04:00
Pavel Chipiga 7d112d0524 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-01 19:33:46 +02:00
George Vinogradov dedd64f976 [issue #195] Returned lost files. 2012-03-01 03:29:16 +04:00
konstantin.grabar 5b25ea221b [refs #195] Add default value to is_rpm field for projects 2012-02-29 22:27:57 +04:00
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
konstantin.grabar 12d8f5e7b8 [refs #232] Add new design to some group pages 2012-02-29 21:12:06 +04:00
Pavel Chipiga cefaa902b1 Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223 2012-02-29 16:04:38 +02:00
George Vinogradov fe46e53ad8 [issue #195] Many changes.
*  Base presenter moved to lib
  *  Added diff display
  *  Changes in some views

TODO Add translations.
TODO Change commit page layout.
TODO Change representation of commit on commit page.
TODO Fix bug with tree/branch select.
2012-02-29 06:02:07 +04:00
konstantin.grabar e9ae923b60 [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-28 20:10:31 +04:00
Alexander Machehin bc4a157703 Merge branch '3.2-master' into 194-tracker
Conflicts:
	app/assets/stylesheets/application.scss
	app/views/issues/_form.html.haml
	app/views/platforms/show.html.haml
2012-02-28 20:13:08 +06:00
Alexander Machehin 0d75a37451 [refs #194] show page beta version 2012-02-28 20:05:18 +06:00
Pavel Chipiga 39d42c1721 Fix seeds 2012-02-27 23:11:43 +02:00
Pavel Chipiga 159ef26b38 Merge branch 'master' into 3.2-master
Conflicts:
	app/views/wiki/_compare.html.haml
	app/views/wiki/_diff_data.html.haml
	db/schema.rb
2012-02-27 22:32:57 +02:00
Pavel Chipiga 5e58ec9e59 Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-24 19:27:58 +04:00
Alexander Machehin 41861185c0 [refs #134] fixed git hook 2012-02-24 19:27:56 +04:00
Alexander Machehin e1f1e4aff4 remove broken migration 2012-02-24 19:27:55 +04:00
Pavel Chipiga fd15a39f7a Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161 2012-02-24 19:27:54 +04:00
konstantin.grabar 3c5cdfd5e4 [refs #195] Add is_rpm field to projects. Continue set new design 2012-02-24 17:05:58 +04:00
Alexander Machehin 9e5e7cd5e4 [refs #194] labels manage 2012-02-23 20:48:46 +06:00
konstantin.grabar ba1798fd71 [refs #195] Add design to form and edit page 2012-02-22 21:48:37 +04:00
Alexander Machehin ecb29d1762 [refs #194] tags -> labels 2012-02-22 02:28:04 +06:00
George Vinogradov 85f3d956f5 [issue #195] Merge branch '203-feed_message' into 195-new_design_for_projects
Conflicts:
	app/views/layouts/application.html.haml
2012-02-21 19:42:30 +04:00
Pavel Chipiga ed60751dfa Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-21 01:13:05 +02:00
Alexander Machehin 0ce76207af [refs #194] Add issue tags 2012-02-21 00:41:40 +06:00
Alexander Machehin 76beb6a277 [refs #194] add creator to issue 2012-02-19 23:28:43 +06:00
Vladimir Sharshov 98059d6570 Merge pull request #191 from warpc/134-git-hook
[refs #134] Fixed git hook (hadr-coded desctionation and wrong rails env)
2012-02-16 05:52:09 -08:00
Alexander Machehin 20836e8864 [refs #134] fixed git hook 2012-02-15 17:12:49 +06:00
Alexander Machehin 3690d69663 remove broken migration 2012-02-15 00:50:55 +06:00
Pavel Chipiga b7b69a86d8 Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96 2012-02-14 18:05:41 +02:00
Pavel Chipiga 02478f5451 Merge branch 'master' into 96-upgrade_rails 2012-02-14 14:05:27 +02:00
Pavel Chipiga 7bca61c58d Fix cancan regsiter_requests specs. Temporary fix specs running bug through file rename. Refs #161 2012-02-14 13:50:01 +02:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00
Pavel Chipiga 7d74b0af13 Merge branch 'master' into 96-upgrade_rails
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/group.rb
	app/views/layouts/application.html.haml
	db/schema.rb
	public/stylesheets/git/style.css
2012-02-14 02:14:03 +02:00
George Vinogradov 99c314fb11 [issue #133] Merge branch 'master' into 133-editing_from_web
Conflicts:
	db/schema.rb
2012-02-13 21:48:40 +04:00
Pavel Chipiga 704c544cbc Add more register_requests fields, change design. Apply invitation mail sending. Refactor. Refs #174 2012-02-10 18:33:16 +02:00
George Vinogradov ce39cdd04f [issue #174] A half of work to create invitations system 2012-02-09 21:46:23 +04:00
George Vinogradov a4baf8b670 [issue #133] Editor JS moved to separate file 2012-02-09 04:35:07 +04:00
Pavel Chipiga 7223b7deb9 Upgrade rails, devise, delayed_jobs and other gems. Fix dependencies. Apply assets pipeline, add to deploy. Refactor and cleanup Gemfile. Fix after upgrade bugs. Redo commentable_id from string to decimal. Refactor and code cleanup. Apply basic new design. Refactor main template. Automate menus. Improve translations. Refs #96 2012-02-09 01:46:25 +02:00
Alexander Machehin 36f609ec7d [refs #143] fix destroy 2012-02-07 01:47:39 +06:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +04:00
Alexander Machehin fde67a2c22 [refs #134] add post receive hook to repos 2012-02-06 15:31:22 +06:00
Vladimir Sharshov 26923740ad Hot fix for en yml
Add new schema.rb
2012-02-03 01:30:08 +04:00
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki
Conflicts:
	app/models/project.rb
	config/locales/en.yml
2012-02-03 00:55:16 +04:00
Vladimir Sharshov 8562b882da Merge pull request #136 from warpc/114-comment_notifications
Notifications and subscribtions about new comments in commit [Refs #114]
2012-02-01 11:12:24 -08:00
George Vinogradov d0717c8f9e [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	db/schema.rb
2012-02-01 22:39:04 +04:00
Alexander Machehin aa9652409c [refs #114] clean 2012-02-01 01:15:53 +06:00
Pavel Chipiga fde298cc85 Rollback to redhillonrails_core instead of schema_plus to avoid some bugs. Add platform reference to project_imports, change indexes and validators. Adjust sync algoritm to use platform_id. Improve rsync params. Refs #112, #138 2012-01-31 20:48:37 +02:00
George Vinogradov 6f78e5456c [issue #64] Changes for ruby 1.9.3 compatibility. 2012-01-31 20:40:46 +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
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
2012-01-31 02:07:11 +04: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
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
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
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 39a4479fa3 [refs #114] fix emails uniqueness 2012-01-29 22:27:46 +06:00
George Vinogradov 98e1696fd2 [issue #64] Fixed mistake in schema.rb 2012-01-28 16:10:18 +04: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
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
George Vinogradov 9caf496454 [issue #64] Added missing translations. 2012-01-27 20:48:48 +04: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
konstantin.grabar a5d6889999 [refs #128] Add devise confirmable and reconfirmable options 2012-01-27 18:58:38 +04: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
George Vinogradov ba84d5f216 [issue #64] Added validation of own_projects count. 2012-01-27 03:37:19 +04:00
George Vinogradov 1498e937f6 [issue #64] Added own_projects counters to User & Group 2012-01-27 02:33:18 +04:00
konstantin.grabar 0eb0eb9713 [refs #123] Activity Feed logic global refactoring. 2012-01-26 21:04:58 +04:00
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
2012-01-26 14:55:16 +06: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
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 6df1640485 [refs #114] fix logics 2012-01-24 18:18:39 +06:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
Alexander Machehin 71447a29e3 [refs #114] add settings for commits notifications 2012-01-19 00:20:08 +06:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments
18 commit comments
2012-01-18 05:49:57 -08:00
Pasha eb6ec413da Merge pull request #108 from warpc/105-internationalization
105 internationalization
2012-01-18 05:38:55 -08:00
Pavel Chipiga f8be867aaf Replace annotated tags to lightweight. Improve specs. Restore lost migrations. Refs #103 2012-01-17 19:37:41 +02:00
konstantin.grabar bbbf17c2b4 [refs #105] Merge master with 105-internationalization 2012-01-17 17:58:49 +04:00
santaux 62d0419bdd Merge pull request #106 from warpc/103-bl_publish_new_params
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments
Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
	db/schema.rb
2012-01-17 15:52:46 +06: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 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Pavel Chipiga 712ca8d95a Save package_version during success build_list publish. Add specs. Refs #103 2012-01-13 18:45:13 +02:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
George Vinogradov 729bd94045 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	config/routes.rb
	db/schema.rb
2012-01-13 18:05:42 +04:00
Pavel Chipiga c23312ad51 Research and fix problem with build_lists#auto_publish feature. Fix specs. Refs #97 2012-01-11 21:43:33 +02:00
Alexander Machehin c18b71bf0b [refs #18] changed refs id to string 2012-01-12 00:10:23 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar e8977a7d95 Merger issues with master 2011-12-30 18:23:16 +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
Pavel Chipiga acb970686c Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72 2011-12-29 04:37:34 +02:00
George Vinogradov 81378478ca [issue #64] Added Wiki controller and some methods in Project 2011-12-26 21:07:07 +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 5237939f49 Merge issues with master 2011-12-26 13:26:13 +04: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 2c67843c34 Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65 2011-12-21 23:42:06 +02:00
Pavel Chipiga d901426b79 Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65 2011-12-21 16:01:50 +02:00
George Vinogradov 39dade9945 [closed #63] Added user column to build_list. 2011-12-20 21:09:29 +04: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 76c5c86c27 Add db default value for build_lists field build_requires. Refs #2261 2011-11-30 21:03:58 +02:00
Pavel Chipiga 0134f4adf9 Fix bugs after renaming unixname to name. Refs #2261 2011-11-30 01:41:12 +02:00
konstantin.grabar ff9bfa3f9d [refs #2249] Add corrections to rspec controllers tests 2011-11-29 18:36:51 +04:00
konstantin.grabar bc504dfcf7 [refs #2249] Add more fixes to global renaming 2011-11-29 14:51:14 +04:00
konstantin.grabar 3b03aca2a8 [refs #2249] Global renames fixes 2011-11-29 14:51:14 +04:00
konstantin.grabar 148a0fec28 [refs #2249] Global name to description and unixname to name renames 2011-11-29 14:51:14 +04:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00
konstantin.grabar 0573acb650 [refs #2249] Add more Collaborators and Projects controllers specs 2011-11-24 23:22:37 +04:00
Pavel Chipiga 141fe7677f Apply project fork button. Refactor and cleanup code. Refs #2243 2011-11-23 17:52:33 +02:00
konstantin.grabar 140eaf6265 [refs #2249] Remove old roles managment system 2011-11-21 21:43:37 +04:00
konstantin.grabar 4d4f5deed4 [refs #2249] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers 2011-11-16 22:45:01 +04:00
Pavel Chipiga e7f9d8251a Rename product field build to build_script. Change links. Refs #2161 2011-11-11 21:12:15 +02:00
Pavel Chipiga 7996740ae7 Improve build_lists time. Apply product build lists basic functionality. Move product build functionality to separate controller. Apply event logging for product build. Fix logging for project build list publishing. Code refactor and cleanup. Refs #2161 2011-11-11 19:13:09 +02:00
Vladimir Sharshov 620b042d69 Remove non used arch 2011-11-02 12:22:27 +04:00
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
Pavel Chipiga 0c3a044f81 Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162 2011-10-30 18:46:52 +02:00
konstantin.grabar 30564e8e17 [refs #2161] Add auto build lists functional 2011-10-29 23:09:50 +04:00
Vladimir Sharshov 8c7b196764 Update BuildListItems for new requirement 2011-10-29 18:05:40 +04:00
Pavel Chipiga 7a00c64bee Stub dev XML RPC. Imporve docs and increase git timeout. Refs #2136 2011-10-28 19:01:41 +03:00
konstantin.grabar 6238012fa9 [refs #2106] Move visibility logic to platforms 2011-10-28 11:20:13 +04:00
George Vinogradov a833964952 Fixed bug with roles seeding. 2011-10-28 03:37:07 +04:00
Pavel Chipiga 60f4e34bee Fix seeds 2011-10-28 00:31:49 +03:00
Pavel Chipiga 8fadbfbd66 Redo with_ga include trying to fix strange production bug. Refs #2136 2011-10-27 22:23:31 +03:00
George Vinogradov 87cdb88731 Added use_default and use_default_for_owner to roles 2011-10-27 22:09:22 +04:00
konstantin.grabar 89312375fd Merge master and personal_repos 2011-10-27 17:13:53 +04:00
konstantin.grabar 3114eb1ecc [refs #2106] Add personal repos to project. Some changes of private repos controller and logic 2011-10-27 17:04:03 +04:00
Pavel Chipiga 0171a0a42a Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136 2011-10-26 23:57:51 +03:00
George Vinogradov 58d0d1b049 Added lost migration, that adds on and to fields to roles 2011-10-26 18:09:35 +04:00
konstantin.grabar 9c182f0bda Merge master and build_lists_queue 2011-10-24 14:40:36 +04:00
George Vinogradov 82d72a851c ACL for testing. 2011-10-24 01:39:44 +04:00
konstantin.grabar c24a9fae1b [refs #1832] Build Lists updates. Project updates and fixes. 2011-10-22 19:28:41 +04:00
Pavel Chipiga 310f588621 Resolve conflict with User nickname and uname 2011-10-21 20:17:49 +03:00
Pavel Chipiga 644d57b420 Merge branch 'catalog'
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/repositories/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-21 17:55:41 +03:00
George Vinogradov 505cb74c34 Merge branch 'itima_web_refactoring'
Conflicts:
	app/models/user.rb
2011-10-20 20:00:52 +04:00
George Vinogradov a92282de1e Merge branch 'chipiga'
Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	db/schema.rb
2011-10-20 19:55:03 +04:00
George Vinogradov 1659ad5805 Merge branch 'private_repos'
Conflicts:
	config/application.yml.sample
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:49:35 +04:00
George Vinogradov 2dd99d32f9 Merge branch 'downloads'
First turn of merging.

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-20 19:22:11 +04:00
Pavel Chipiga 5291752419 Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858 2011-10-19 23:58:31 +03:00
Toljio b84ab42d00 add extension actions, model role_relations 2011-10-20 00:19:45 +04:00
George Vinogradov ff36b1fdd3 Merge branch 'itima_web_refactoring'
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
2011-10-19 18:09:58 +04:00
George Vinogradov 126e9e1db1 Merge branch 'itima_web_refactoring' of github.com:warpc/rosa-build into itima_web_refactoring
Conflicts:
	app/models/platform.rb
2011-10-19 17:23:23 +04:00
Toljio e5438b29bc change roles/rights 2011-10-18 22:32:08 +04:00
George Vinogradov f7ff112087 Finished models. 2011-10-18 19:07:09 +04:00
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
George Vinogradov 76e8b52812 Changed DB structure. 2011-10-17 18:18:37 +04:00
Pavel Chipiga d57347648f Fix migration 2011-10-17 13:29:07 +03:00
Pavel Chipiga 5f705cdd0d Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828 2011-10-17 11:04:36 +03:00
George Vinogradov f76a3aee39 Added groups representation. 2011-10-17 00:48:02 +04:00
santaux 8103b14e15 [refs #1861] Add downloads statistics 2011-10-14 10:35:25 +04:00
George Vinogradov 229b4bb3f4 Created new models and provided relationships between them. 2011-10-13 19:55:03 +04:00
Pavel Chipiga 77e03df70b Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954 2011-10-11 23:56:51 +03:00
Timothy N. Tsvetkov c927abd073 added crontab to products without translations and setting values to generator form for existing crontab line 2011-04-28 18:32:11 +04:00
Timothy N. Tsvetkov 577cb2e126 added platform cloning and system_wide flag 2011-04-14 21:04:32 +04:00
Alexey Nayden 856b93d3d8 Product management. Step 2 2011-04-14 11:23:08 +04:00
Alexey Nayden 231771890e Confilict resolve 2011-04-11 20:57:43 +04:00
Alexey Nayden dce4e76da1 Product management. Step 1 2011-04-11 20:55:52 +04:00
Timothy N. Tsvetkov 1a6330956b build list creation 2011-04-11 20:37:09 +04:00
Timothy N. Tsvetkov e3b12e4a1a merge 2011-04-11 14:52:37 +04:00
Timothy N. Tsvetkov 82869f57a7 build list items and more statuses 2011-04-11 14:47:57 +04:00
Alexey Nayden cd6e7ade15 Product Builder xml-rpc and Product model 2011-04-11 12:35:08 +04:00
Timothy N. Tsvetkov 62d0985fcb more methods fot build lists, added is_circle build flag 2011-04-07 18:56:28 +04:00
Timothy N. Tsvetkov 4ac5931f44 fixes + build lists 2011-04-07 17:20:21 +04:00
Alexey Nayden 3350d420d3 fixed user seeds 2011-03-30 02:16:04 +04:00
Timothy N. Tsvetkov 3b51d53225 freeze + spec 2011-03-17 17:47:16 +03:00
Alexey Nayden 002dc417b5 Container/Arch/Rpm 2011-03-16 00:52:27 +03:00
Alexey Nayden c1ff6dcc05 Arch, container and rpm models 2011-03-12 17:15:30 +03:00
Alexey Nayden 7896c4e7d3 Container model 2011-03-12 16:35:00 +03:00
Alexey Nayden 80304ef7f2 Trying to add repositories to my hierarchy 2011-03-11 19:08:41 +03:00
Alexey Nayden 5ce300adb9 Directory creation for projects/platforms 2011-03-11 13:25:50 +03:00
Alexey Nayden 1847779319 Seed task for projects and platforms 2011-03-10 16:45:19 +03:00
Alexey Nayden af3c9b52be Hoptoad + blank platforms#index 2011-03-09 22:27:51 +03:00
Alexey Nayden 0218f5dfd0 Platform and Project core models 2011-03-09 20:38:21 +03:00
Alexey Nayden d3fd18a700 Device users 2011-03-09 19:16:48 +03:00
Alexey Nayden eae3c46912 Initial commit 2011-03-09 16:13:36 +03:00