Commit Graph

526 Commits

Author SHA1 Message Date
Vokhmin Alexey V eba86106ca #755: fix: undefended constants 2012-12-11 19:25:25 +04:00
Vokhmin Alexey V 1c51a2d514 #755: update path to platform for personal platforms, some refactoring 2012-12-11 15:47:32 +04:00
Vokhmin Alexey V f00b168b20 #755: update PublishBuildListContainerObserver, some refactoring 2012-12-11 14:42:15 +04:00
Vokhmin Alexey V 8ef5129e00 #755: update logging for publishing BuildList 2012-12-10 22:29:09 +04:00
Vokhmin Alexey V b62414ec1d #755: update BuildList#publish_container 2012-12-10 22:04:33 +04:00
Vokhmin Alexey V 0fe74f17ac #755: merge master into the branch 2012-12-10 21:05:25 +04:00
Vokhmin Alexey V e0a1abcd4c #755: remove unnecessary weorkers, add Observer 2012-12-10 21:01:34 +04:00
Vladimir Sharshov c677e37c20 Merge pull request #763 from warpc/759-stop-and-delete-action-for-build-list
[refs #759]: cancel ProductBuildList and BuildList;
refactroing ProductBuildList; add new user role "tester"; set timeout for workers to 12 hours; refactoring worker_observers
2012-12-07 03:58:57 -08:00
Vokhmin Alexey V ba14771842 #759: increase time 2012-12-07 15:22:41 +04:00
Vokhmin Alexey V a8e1cea057 #759: save sec of time_living instead of minut, some fixes of state_machine 2012-12-07 15:11:12 +04:00
Vokhmin Alexey V eae2b2ce02 #759: add state_machine into the ProductBuildList 2012-12-06 23:18:28 +04:00
Vokhmin Alexey V ab8c4016b5 #759: refactoring according to Vladimir's comments 2012-12-06 21:34:09 +04:00
Vokhmin Alexey V ef8ece3e87 #759: update status for BuildList::Item, fix getting logs 2012-12-06 20:28:44 +04:00
Vokhmin Alexey V 60f2ab3d96 #759: some fixes 2012-12-06 20:00:24 +04:00
Vokhmin Alexey V da4eb1852e #759: update rpm_worker_observer 2012-12-06 19:22:27 +04:00
Vladimir Sharshov a9e94e1433 Merge pull request #754 from warpc/751-move-link-to-file-store-into-app-config
[refs #751]: add url to file-store into the application.yml
2012-12-06 07:08:31 -08:00
Vokhmin Alexey V ff2ae73985 #759: add action for cancel build, some refactoring 2012-12-06 18:41:24 +04:00
Vokhmin Alexey V 1f74b25522 #755: add workers for publishing build_lists 2012-12-06 14:11:51 +04:00
Alexander Machehin 76223ebff8 [refs #753] add rake 2012-12-06 13:34:45 +06:00
Vokhmin Alexey V d0179d03b6 #751: add url to file-store into the application.yml 2012-12-05 14:56:59 +04:00
Vokhmin Alexey V 5defd009d3 #751: show link to diff in "Items" section 2012-12-04 19:48:30 +04:00
Vladimir Sharshov d39c07475f Merge pull request #748 from warpc/735-fetch-data-for-container
[refs #735]: fill packages of BuildList when use new_core
2012-12-04 03:36:47 -08:00
Alexander Machehin 9e5a7e3fdb [refs #674] fix get last published commit 2012-12-04 15:59:16 +06:00
Alexander Machehin 42e76f5fa6 [refs #674] fix undefined method 'last_published_commit_hash' for product build list 2012-12-04 09:33:04 +06:00
Alexander Machehin b132a56937 Merge branch 'master' into 674-diff_between_commits
Conflicts:
	db/schema.rb  fresh
2012-12-04 00:02:45 +06:00
Alexander Machehin ec6279d803 [refs #674] add diff to build lists 2012-12-03 23:43:24 +06:00
Vokhmin Alexey V 3ef841184c fill packages of BuildList when use new_core 2012-12-03 21:17:20 +04:00
Vokhmin Alexey V 5c3514ec0f add rpm_worker_observer to resque 2012-11-30 17:59:21 +04:00
Vokhmin Alexey V 3d6269da9b add results column to build_lists table 2012-11-27 18:22:17 +04:00
Vokhmin Alexey V c7ea2f7656 send task to abf-worker 2012-11-26 22:00:29 +04:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Alexander Machehin fc3350d8b7 [file-store-4] fix import 2012-11-15 16:28:03 +06:00
Vladimir Sharshov 41ce06b36e Merge pull request #722 from warpc/90-error_on_create
[refs #90] Fix error on pull create, create special place for temporary pull request, add cron task for clear temporary pull request, add cron task for clearing activity feed, fix build list pagination error
2012-11-14 10:31:53 -08:00
Alexander Machehin 50ce84bfa9 remove old activity feeds 2012-11-15 00:10:03 +06:00
Alexander Machehin 3ddef19a29 [refs #90] fix deleting old temporary git repos 2012-11-14 23:15:44 +06:00
Alexander Machehin 1007e2c476 [refs #90] fix deleting empty dir 2012-11-14 22:46:09 +06:00
Alexander Machehin 56e9174045 [refs #90] avoid collisions with temporary repos 2012-11-14 22:28:21 +06:00
Alexander Machehin b21046ba50 [refs #90] clean old temporary git 2012-11-14 21:48:20 +06:00
Vokhmin Alexey V 0127f512cb add iso_worker_observer to queue 2012-11-14 14:55:37 +04:00
Vokhmin Alexey V 21d8a42072 merge master into the branch 2012-11-12 20:52:33 +04:00
Alexander Machehin 8b2126d2a7 [refs #90] fixed migration & task for pull path 2012-11-12 20:59:46 +06:00
Vladimir Sharshov 06421dbdec Merge pull request #714 from warpc/90-fix_orphan_pulls
[refs #90] fixed orphan pulls
2012-11-12 02:34:21 -08:00
Alexander Machehin 1a1a0ebb30 remove cooker from import task 2012-11-12 16:02:23 +06:00
Alexander Machehin daa8bc72ee wrong method 2012-11-09 21:07:52 +06:00
Alexander Machehin f2ccc90a4c [refs #90] fix task 2012-11-09 21:01:22 +06:00
Alexander Machehin 26af1aa27c Merge branch 'master' into 90-fix_orphan_pulls
Conflicts:
	app/models/pull_request.rb
2012-11-09 20:53:55 +06:00
Alexander Machehin 726aee49ff [file-store-4] remove archives in the srpm import 2012-11-09 20:14:26 +06:00
Vokhmin Alexey V 3d293b908d added IsoWorkerObserver 2012-11-09 01:39:42 +04:00
Vokhmin Alexey V 4595ce349c Merge branch 'master' into iso-worker 2012-11-08 18:17:35 +04:00
Alexander Machehin e9233d362a add new git_path param 2012-11-08 15:13:48 +06:00
Vokhmin Alexey V 9d7de35ec4 start ISO worker 2012-11-07 18:32:46 +04:00
Vokhmin Alexey V 6a7035d551 added #show action for product_build_list 2012-11-06 22:01:54 +04:00
Vokhmin Alexey V e39ca302d7 #new action for build ISO - done. 2012-11-06 21:17:44 +04:00
Alexander Machehin 0d893c4b20 [file-store-4] rename task file && remove abf.yml check && some optimize 2012-11-06 21:54:24 +06:00
Vokhmin Alexey V ecec330b4d added migration, updated models, UI 2012-11-06 18:13:16 +04:00
Alexander Machehin eabb47c580 [file-store-4] do copyback repos by default 2012-11-05 17:13:50 +06:00
Alexander Machehin 0246b1f5bf [file-store-4] some fixes 2012-11-05 16:38:29 +06:00
Alexander Machehin 03cb24fb9f [file-store-4] modify uploading script 2012-11-02 23:45:40 +06:00
Alexander Machehin 345e4f698b Merge branch 'master' into file-store-4_git_task
Conflicts:
	Gemfile
2012-11-02 23:08:38 +06:00
Alexander Machehin 576cec527e fix mistake 2012-10-28 09:54:23 +06:00
Alexander Machehin c6a0dfee97 [refs #90] fixed orphan pulls 2012-10-28 00:04:28 +06:00
Alexander Machehin 95e5804358 [refs #90] fixed git timeout error on the big diff 2012-10-26 20:03:46 +06:00
Alexander Machehin 6c8c1ca880 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-10-19 18:47:26 +06:00
Alexander Machehin 7ad1a82876 [refs #700] fix fork && repare task 2012-10-18 20:34:32 +06:00
Alexander Machehin 694037af7e [refs #579] remove unused lib 2012-10-08 20:47:03 +06:00
Alexander Machehin 2360a25a42 [refs #579] fixed many errors 2012-10-05 17:02:25 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Vladimir Sharshov 7756f6200d [refs #374] Add http headers for rate limit, restrict rate limit only for api calls. 2012-09-28 01:07:19 +04:00
Alexander Machehin ccb004bc03 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-09-26 16:27:46 +06:00
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Pavel Chipiga d34c79aabe Fix add_branch script. Refs #112 2012-09-19 19:32:53 +03:00
Pavel Chipiga faafd7a5dc Merge branch 'master' into file-store-4_git_task 2012-09-18 22:02:37 +03:00
Pavel Chipiga 2db88d90f3 Remove branch if alredy exists during branch fork action. Refs #112 2012-09-17 13:09:30 +03:00
Vladimir Sharshov 54c6ba55be [refs #349] Disable global menu Projects and Platforms; Allowed full search; Protect user and maintainer emails; Refactoring right rules 2012-09-06 21:09:10 +04:00
Vladimir Sharshov ff20c0b199 Merge pull request #622 from warpc/620-maintainer_db
[refs #620] Maintainer DB
2012-08-31 11:50:02 -07:00
Alexander Machehin 6a50e18932 [refs file-store-4] one more check 2012-08-31 11:02:58 +06:00
Alexander Machehin e0c25563f0 [refs file-store-4] small refactoring 2012-08-31 10:59:40 +06:00
Alexander Machehin 1e84da0057 [refs file-store-4] git task 2012-08-31 00:49:42 +06:00
Vladimir Sharshov f8b39af7d3 Change destination for rhel package auto import from testhat to server group 2012-08-29 01:04:00 +04:00
George Vinogradov f688985814 [issue #620] Changed maintainer assignment.
*  Added `project:maintainer:set_to_owner` task to set projects maintainer
     to its owner
  *  Removed callbacks and methods to find maintainer 'on-the-fly'
2012-08-28 01:12:53 +04:00
Pavel Chipiga 5a43550282 Refactor add_branch task and add list based branch forking. Refs #112 2012-08-27 19:01:59 +03:00
George Vinogradov 2fbb72e537 [issue #620] Changes in Maintainer db:
*  Added maintainer selection on project page (see TODO in sources);
  *  Added `actual` field to BuildList::Package;
  *  Added rake task to set BuildList::Package.actual field.
     Run it after migration (see TODO in sources);
  *  Packages after publising of BuildList becomes actual;
  *  Added MaintainerPresenter to avoid long method chains.
2012-08-24 19:21:24 +04:00
Pavel Chipiga 77ff4e71e8 Improve import sync script to work with EPEL ang RHEL repositories. Refs #112 2012-08-15 16:58:17 +03:00
Alexander Machehin b2ff7326d1 Merge branch 'master' into 90-pull
Conflicts:
	config/locales/en.yml
	config/locales/ru.yml
2012-08-13 15:01:43 +06:00
Alexander Machehin c1c9f9680e [refs #90] remove code duplication 2012-08-10 22:40:09 +06:00
Vladimir Sharshov d195ef3aad Inform the kernel about project git address(part 2) 2012-08-09 18:11:20 +04:00
Alexander Machehin 818698f320 Merge branch 'master' into 90-pull
Conflicts:
	lib/tasks/import.rake
2012-08-09 00:16:36 +06:00
Alexander Machehin 910aac939e [refs #90] fixed changing tabs & anchors 2012-08-08 21:47:58 +06:00
Pavel Chipiga 6dad9d8804 Add srpm release to version comparison and commit message. Redo logging to simplify parsing. Refs #112 2012-08-07 23:23:30 +03:00
Alexander Machehin a316105e9c Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-07 18:21:04 +06:00
Vladimir Sharshov ffb6d5964e [refs #604] Fix typo 2012-08-07 01:15:55 +04:00
Vladimir Sharshov 30efe134ef [refs #604] Remove old and empty mass builds 2012-08-07 01:07:54 +04:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
Pavel Chipiga 80d69a9248 Improve srpm import script for processing projects which already exists. Refs #112 2012-08-03 13:31:50 +03:00
Pavel Chipiga 33d722b779 Fix branch_or_tag parse constraint, minor refactor. Refs #263 2012-08-02 17:54:34 +03:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
Pavel Chipiga 01a3572de0 Minor update. Fix helper bug. Minor refactor. Refs #263 2012-07-31 17:35:18 +03:00
Vladimir Sharshov 43309d86e6 Merge branch 'master' into 441-key_pairs, fix schema, add migration
Conflicts:
	db/schema.rb
2012-07-31 02:02:15 +04:00
Alexander Machehin 6c11597de6 Merge branch 'master' into 90-pull 2012-07-30 16:53:59 +06:00
Pavel Chipiga 7495c9878b Merge branch 'master' into 263-refactoring 2012-07-30 02:32:56 +03:00
Pavel Chipiga 27030566a4 Update rails, grit, gollum. Fix re-encoding bug. Refs #263 2012-07-30 02:32:23 +03:00
Alexander Machehin 25bdbb01d6 [refs #90] project fullname 2012-07-27 18:52:31 +06:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
Vladimir Sharshov 5aecdc203b Merge pull request #571 from warpc/263-refactoring
[refs #263] Big git refactoring
2012-07-27 04:51:34 -07:00
Pavel Chipiga b476f7248c Minor refactor. Refs #263 2012-07-27 13:47:23 +03:00
Pavel Chipiga 566cd8209b Take back branches_and_repos method. Refs #263 2012-07-27 00:24:14 +03:00
Pavel Chipiga 35e673d44e Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263 2012-07-27 00:15:57 +03:00
George Vinogradov 6f4f48cbce [issue #578] Fixed error handling in PresonalRepository. 2012-07-26 01:49:55 +04:00
Alexander Machehin 9c4db595cb [refs #579] new line comment icon 2012-07-25 22:24:58 +06:00
Alexander Machehin 27ad29d365 [refs #90] some inline callback refactoring 2012-07-19 22:55:23 +06:00
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Pavel Chipiga 611b22baa5 Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263 2012-07-17 11:02:56 +03:00
konstantin.grabar b4059c67fc [refs #441] Add key pairs for platform 2012-07-13 15:18:12 +04:00
Alexander Machehin 10b828c644 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
	vendor/assets/javascripts/vendor.js
2012-07-10 18:35:49 +06:00
George Vinogradov 2839dc14b6 [issue #428] Using #name_with_owner in projects pages. 2012-07-09 19:19:30 +04:00
George Vinogradov 1cfd1975d5 [issue #428] Projects shows with owner name. 2012-07-04 22:52:09 +04:00
Alexander Machehin 89abd20c95 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-07-03 21:22:10 +06:00
Pavel Chipiga e78d9c54a1 Code cleanup. Refs #543 2012-06-29 16:52:32 +03:00
Pavel Chipiga d3e89393a8 Stop resque workers through rake. Refs #543 2012-06-29 16:09:06 +03:00
Alexander Machehin 1ffb1b3940 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/models/project.rb
	db/schema.rb
2012-06-27 16:20:38 +06:00
Alexander Machehin 62556478dc [refs #510] fixed recipe 2012-06-27 11:46:18 +06:00
Alexander Machehin e7627b93f6 [refs #510] fixed resque recipe 2012-06-26 21:25:35 +06:00
Pavel Chipiga 3cc2f0fe62 Rollback stop_wokers scenario. Refs #510 2012-06-20 19:39:27 +03:00
konstantin.grabar dc8a11fa68 [refs #505] Merge master into 505-state_machine_migrate 2012-06-19 13:43:38 +04:00
konstantin.grabar b90c6acaf7 [refs #510] Add resque workers silent kill to capistrano 2012-06-18 18:39:15 +04:00
Pavel Chipiga cb8345a207 Rename and separate queues. Refs #510 2012-06-18 17:16:53 +03:00
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 ac7a3980cd [refs #505] Pending some tests. Return set_version_and_tag. Fix post_build action 2012-06-15 20:05:55 +04:00
Pavel Chipiga d45e95b0e9 Merge branch 'master' into 207-platform_clone
Conflicts:
	app/views/layouts/menu/_top.html.haml
2012-06-09 19:08:55 +03:00
Pavel Chipiga ec21c042dd Fix and refactor active menu. Refs #207 2012-06-09 19:04:06 +03:00
konstantin.grabar cdf2316a76 [refs #510] Add queues to capistrano deploy. Add 4 workers to config 2012-06-09 18:53:00 +04:00
konstantin.grabar f37e0e54a3 [refs #510] Replace dj with resque 2012-06-09 16:52:29 +04:00
Pavel Chipiga b0073381e8 Add run example. Refs #112 2012-06-08 21:01:33 +03:00
Pavel Chipiga 63c50aee7b Apply task for sprm import. Refs #112 2012-06-08 20:19:19 +03:00
konstantin.grabar da33173700 [refs #510] Add multiple workers. Change kill and start logic 2012-06-08 16:40:50 +04:00
konstantin.grabar 7a3caf01bd [refs #510] Add 2 resque workers to deploy config 2012-06-08 14:27:39 +04:00
Alexander Machehin 5f50bacbe6 [refs #90] some refactoring with rtruncate method 2012-06-08 13:38:24 +06:00
konstantin.grabar 597ac65dee [refs #510] Resque deploy refactor. Turn off bluepill 2012-06-07 19:13:58 +04:00
konstantin.grabar a266e57219 [refs #510] Add bluepill stop, start and restart to depoy and stop recipe 2012-06-07 13:27:19 +04:00
konstantin.grabar 8dbdcee5e6 [refs #510] Add resque start to bluepill 2012-06-06 18:54:03 +04:00
konstantin.grabar 9a55555856 [refs #510] Add resque require and change second method 2012-06-05 14:23:25 +04:00
konstantin.grabar 83736ac86d [refs #510] Rename recipe methods names to right variants 2012-06-04 18:17:55 +04:00
konstantin.grabar 7d58937149 [refs #510] Add resque recipes for capistrano 2012-06-01 16:54:58 +04:00
konstantin.grabar 216b0da98e [refs #510] Remove fork and import dj queues 2012-05-31 17:50:42 +04:00
konstantin.grabar 2faa6edb7d Rename rsync_stub to symlink_stub and fix crush 2012-05-21 14:34:29 +04:00
konstantin.grabar 9920802006 [refs #438] Fix symlink stubbing 2012-05-18 13:03:42 +04:00
konstantin.grabar 314506cc76 [refs #438] Add lst files moves to rake task 2012-05-17 10:48:42 +04:00
konstantin.grabar 208310e83b [refs #438] Add rake task to symlink migrate. Change rsync stubs 2012-05-16 17:01:25 +04:00
Vladimir Sharshov 64d5600e6f Merge pull request #447 from warpc/443-tour
[refs #443] Tour about the system
2012-05-12 10:11:16 -07:00
Alexander Machehin 7a011606a5 [refs #443] add pirobox popup 2012-05-12 19:17:07 +06:00
Alexander Machehin 5f5eb00c4f [refs #443] abf tour 2012-05-12 00:15:20 +06:00
George Vinogradov b74dd01262 [issue #430] Changed task 2012-05-11 22:00:27 +04:00
George Vinogradov 1a9f529152 [issue #430] Added rake task to remove outdated BuildLists. 2012-05-11 21:44:19 +04:00
Pavel Chipiga 5157f31081 Refactor routes to separate owner profile and project. Redo short groups profile URL. Improve specs. Refs #236 2012-05-04 00:52:56 +03:00
Pavel Chipiga abb60a503a Minor design fix. Refactor register requests. Refactor case insensitive search. Other minor fixes and code cleanup. Refacor and improve owner constraint. Refs #263 2012-05-03 17:08:02 +03:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03: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
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in
EventLog
2012-04-26 05:38:33 +04:00
Pavel Chipiga cf907c19e8 Merge branch 'master' into 263-refactoring
Conflicts:
	app/controllers/build_lists_controller.rb
2012-04-24 19:06:43 +03:00
Pavel Chipiga 7af06cc7ab Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263 2012-04-23 23:55:42 +03: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
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
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
2012-04-19 19:32:11 +04:00
Vladimir Sharshov 44ca501962 [Refs #194] Fix tests
[Refs #263] Update kernel API call
2012-04-16 21:51:51 +04:00
George Vinogradov 442b44a68e [issue #347] Added not_member_of scope. Added ActsLikeMember module 2012-04-10 19:45:38 +04:00
Pavel Chipiga 76f7507b22 Fix DJ deploy recipies. Refs #263 2012-04-05 22:26:18 +03:00
Alexander Machehin 42aaa7c27a [refs #295] fixed restarting DJ 2012-04-06 00:06:24 +06: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
Alexander Machehin 349e173f60 [refs #295] deploy recipes for dj 2012-04-04 23:00:35 +06:00
Vladimir Sharshov a0396d2d8c [Refs #263] Fix " undefined local variable or method `platforms' for Group 2012-04-03 13:39:29 +04:00
Alexander Machehin f4b3a4275a [refs #263] some hook task improvement 2012-04-03 01:30:14 +06:00
Alexander Machehin 5a384c6846 [refs #263] added dj queues 2012-04-03 01:29:06 +06: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 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 5db485a4c0 [Refs #263] Remove Aut BuildList. Part 2 2012-03-29 22:43:46 +04:00
Vladimir Sharshov 9a45353ccb Merge pull request #342 from warpc/128-account-activation
[Refs #128] account activation
2012-03-29 09:09:03 -07:00
George Vinogradov f74dba6a69 [issue #195] Fixed bug with datatables. 2012-03-28 14:21:50 +04:00
George Vinogradov baf35da99c [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/controllers/projects_controller.rb
2012-03-27 21:23:09 +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
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04:00
Pavel Chipiga cacd9eb301 Improve add_branch task. Fix projects list JSON generation. Refs #207, #279 2012-03-24 00:48:58 +02: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
Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-03-22 21:15:10 +06:00
Alexander Machehin 23eeb1cae7 [refs #270] changes in ban 2012-03-22 20:50:15 +06: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
Vladimir Sharshov abbe849f32 Fix(?) for zero time deploy restart 2012-03-20 22:47:09 +04:00
Vladimir Sharshov 56f1d06da8 [Refs #66] Add priority to build list 2012-03-20 14:08:24 +04:00
Vladimir Sharshov 556c2055b4 Enable unicorn zero time deploy 2012-03-19 18:48:54 +04:00
Alexander Machehin 64aec8db64 [refs #265] remove existing hook when install from task 2012-03-19 15:39:14 +06: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
George Vinogradov 304141b1ba [issue #279] Added views and removed datatables plugin
*  Datatables plugin moved to lib.
  *  Added views to platform and repositories.
2012-03-13 19:12:06 +04:00
Pavel Chipiga a78b7b4155 Merge branch 'master' into 3.2-master 2012-03-11 23:39:11 +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 f6a91ec006 Fix rake task. Refs #282 2012-03-08 01:47:48 +02:00