Commit Graph

252 Commits

Author SHA1 Message Date
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