Commit Graph

108 Commits

Author SHA1 Message Date
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
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
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 de9071ae4f fix collaborator tests 2012-02-24 19:27:54 +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 6fff641531 fix collaborator tests 2012-02-14 17:52:33 +06:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +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
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 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
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Alexander Machehin 371abac031 [refs #114] fix controller tests 2012-01-20 21:17:05 +06:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments
18 commit comments
2012-01-18 05:49:57 -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
santaux 62d0419bdd Merge pull request #106 from warpc/103-bl_publish_new_params
Сохранение сборочного коммита, добавление неподписанного тега на сохраненный коммит после публикации
2012-01-17 04:34:15 -08:00
Pavel Chipiga b5170e2f2a Write specs for tag based build. Refs #103 2012-01-17 14:25:54 +02: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
Vladimir Sharshov 68744b1676 Fix broken tests in #94 from pull request #92 2012-01-17 01:07:48 +04:00
Alexander Machehin 69debdd83e fix tests for shared elements 2012-01-16 19:43:23 +06:00
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin bdc3b3a3d1 [refs #18] controller tests 2012-01-14 18:16:42 +06: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 2b1fe79adc [refs #18] controller tests 2012-01-13 22:00:28 +06: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
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar a44530980e [refs #54] Remove some unnessacary comments 2011-12-30 18:44:47 +04:00
konstantin.grabar e8977a7d95 Merger issues with master 2011-12-30 18:23:16 +04:00
konstantin.grabar 3f72082e0e [refs #54] Add comments, subscribes models specs. Finish subscribes controller specs. Some ability.rb fixes 2011-12-30 18:21:08 +04:00
konstantin.grabar 402133aff6 [refs #54] Add some subscribe specs and factory 2011-12-29 21:03:53 +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
konstantin.grabar a783b460bd Merge issues with master 2011-12-28 13:22:57 +04:00
Pavel Chipiga 5e3addd5d2 Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85. Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54 2011-12-28 04:59:05 +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
Pavel Chipiga 0e5b39985e Clarify tests. Write autostart docs. Refs #65, #53 2011-12-23 20:47:13 +02: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 8c3291d237 Fix and redo specs after great build_lists refactoring and improvement. Fix minor bugs. Code cleanup. Refs #65 2011-12-23 04:14:28 +02:00
George Vinogradov 6c48e058be [close #70] Removed all & filter methods in BuildListsController
*  Removed methods
*  Changed abilities
*  Changed routes
*  Added specs
2011-12-21 05:30:34 +04:00
George Vinogradov 3eb2ae545a [issue #27] Merge branch 'master' into build_list_visibilities
Conflicts:
	app/views/build_lists/_filter.html.haml
2011-12-20 21:25:35 +04:00
George Vinogradov ce008fdeb1 [issue #27] Added group specs. 2011-12-20 16:59:09 +04:00
George Vinogradov 70e04c25fd [issue #27] Rewrited spec. Need to add spec for groups. 2011-12-20 12:44:58 +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