Commit Graph

302 Commits

Author SHA1 Message Date
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
konstantin.grabar 620d78fd1b [refs #442] MassBuilds create refactor and specs fix 2012-07-09 20:48:31 +04:00
Alexander Machehin dd221cc880 [refs #90] autocomplete 2012-07-06 23:30:01 +06:00
konstantin.grabar 1f2a3b82d3 [refs #442] Add tests for mass builds and attr_accessible. Fix ability 2012-07-06 20:49:21 +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 b46a7aba39 Fix branch with dots. Refs #263 2012-07-03 15:05:27 +03:00
Alexander Machehin ea8775f1f7 [refs #547] remove mistake condition 2012-07-03 16:42:58 +06:00
Vladimir Sharshov 7561abca08 [refs #462] refactoring: remove notified_at 2012-06-28 21:40:32 +04: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 d5a6b47be3 [refs #531] user best role tests 2012-06-21 20:19:44 +06:00
Alexander Machehin a033e3192e [refs #531] fixed tests 2012-06-21 16:35:02 +06:00
Alexander Machehin 93ec9a135d [refs #531] some refactoring and model tests 2012-06-21 00:10:27 +06:00
Alexander Machehin 4d91ea1d6e [refs #531] fixed user roles 2012-06-20 23:59:47 +06:00
konstantin.grabar 264273c6c0 [refs #505] Remove comment. Add lost method into build_list model 2012-06-19 19:45:38 +04:00
konstantin.grabar 8e88c32147 [refs #505] Fix tests after merge. Remove ResqueAsyncMethods include 2012-06-19 14:23:03 +04:00
konstantin.grabar dc8a11fa68 [refs #505] Merge master into 505-state_machine_migrate 2012-06-19 13:43:38 +04:00
konstantin.grabar 8ce6c26cc4 [refs #505] Fix state machine tests 2012-06-18 20:19:09 +04: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
konstantin.grabar 6db2fd3d10 [refs #505] Tried to fix strip error. 2012-06-15 17:05:55 +04:00
konstantin.grabar 49ac16ae19 [refs #505] Add changes to spec. Temporary broke tests to show errors 2012-06-15 14:14:32 +04:00
konstantin.grabar 5e7342fbd7 [refs #505] Comment DJ stub. Fix event name call 2012-06-15 12:47:40 +04:00
Alexander Machehin 9af3d22153 [refs #90] auto close after manual merge 2012-06-09 15:09:38 +06:00
Alexander Machehin f6bfb38e79 [refs #90] fixed tests 2012-06-08 18:44:44 +06:00
Alexander Machehin f44b9631ad [refs #90] add pull requests authorizations 2012-05-31 00:08:07 +06:00
Alexander Machehin 5c9f914e4a [refs #511] add issue index authorization 2012-05-30 22:03:07 +06: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
Alexander Machehin e211fa2fc3 [refs #90] fixed errors, add validations & tests 2012-05-23 22:09:11 +06:00
Alexander Machehin 0c89ca6575 [refs #90] broken tests 2012-05-23 00:23:00 +06:00
konstantin.grabar 9aefce6b68 [refs #442] Merge master into 442-mass_build 2012-05-21 18:33:12 +04:00
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06: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
Vladimir Sharshov bfabdc1dc3 Merge pull request #468 from warpc/466-edit_project
[refs #466] fixed access to project and tests for this cases.
2012-05-17 13:11:55 -07: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
Vladimir Sharshov 9e3afa8fc0 Merge pull request #476 from warpc/438-remove_rsync_mount_from_app
[refs #438] Repair arch factory and rename rsync stub method, remove symlink dir creation
2012-05-16 12:09:45 -07:00
konstantin.grabar da70a11aab [refs #438] Repair arch factory and rename rsync stub method 2012-05-16 19:29:28 +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
Alexander Machehin e3caa7274f [refs #466] add update project test 2012-05-15 17:15:34 +06:00
Pavel Chipiga 78ab229c4f Fix advisories relaton. Minor code cleanup. Write more specs. Refs #444 2012-05-14 23:00:04 +03: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 f335863881 Fix dot in project name routes. Refactor and write basic route specs. Refs #454 2012-05-14 16:24:01 +03:00
George Vinogradov 9a0f582a16 [issue #428] Fixed typo in PlatformsHelper 2012-05-10 20:04:48 +04:00
Vladimir Sharshov 8819d0845a [refs 428] Fix tests and merges missing 2012-05-05 23:26:34 +04:00
George Vinogradov 1f07332892 [issue #428] Merge branch 'master' into 428-advisory
Conflicts:
	app/controllers/projects/build_lists_controller.rb
	config/routes.rb
	db/schema.rb
2012-05-04 21:29:04 +04:00
George Vinogradov 8350fc8fb1 [issue 428] Added advisory. 2012-05-04 21:12:51 +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
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 377035c911 [refs #263] dont change/remove owner from group && tests 2012-05-03 18:25:06 +06:00