Commit Graph

282 Commits

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