Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,332 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

55 Commits

Author SHA1 Message Date
Vokhmin Alexey V 5f0e683711 #90: moved code 2012-09-26 19:41:00 +04:00
Vokhmin Alexey V efe8b1ffdb #90: small refactoring 2012-09-26 18:20:46 +04:00
Vokhmin Alexey V 07b27b934f #90: updated #index page for pull-requests 2012-09-26 15:46:23 +04:00
Alexander Machehin a7f926bbdf [refs #90] forgot dependent destroy 2012-08-08 00:07:26 +06:00
Alexander Machehin ae4c8a6a5e [refs #90] fixed lost data after merge 2012-06-28 16:44:55 +06:00
Alexander Machehin 682f33a9bf [refs #90] view merged status 2012-06-13 23:52:11 +06:00
Alexander Machehin 4b8def5bd0 [refs #90] add pulls to tracker 2012-06-04 23:00:19 +06:00
Alexander Machehin 60aba754ae [refs #90] pull title/body update 2012-05-31 22:57:52 +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 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
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 58776a6e9e [refs #90] fixing pull methods 2012-04-23 23:34:10 +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
Alexander Machehin 2dedbd92d0 [refs #194] assignee & user 2012-04-14 01:44:04 +06:00
Vladimir Sharshov dc6e380647 Merge pull request #296 from warpc/194-issue_page 
[refs #194] fixed remove executor from issue
 2012-03-14 04:18:29 -07:00
Alexander Machehin 4b8e9682b5 [refs #194] some refactor 2012-03-14 16:53:23 +06:00
Alexander Machehin 5ffd976086 [refs #194] fixed remove executor from issue 2012-03-14 16:39:59 +06:00
Alexander Machehin 5b932879e2 [refs #265] fixed subscribe dublicates 2012-03-13 19:56:58 +06:00
Alexander Machehin b9de81f4df [refs #194] managing labels in the issue 2012-03-06 21:21:13 +06:00
Alexander Machehin 9e6d06f1c9 [refs #194] manage issue executer 2012-03-06 00:28:55 +06:00
Pavel Chipiga a831a4aa63 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-03 01:43:14 +02:00
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
Alexander Machehin 7cd3e40efc [refs #194] fix accessible list 2012-03-03 01:23:45 +06:00
Alexander Machehin 0abea8ff55 [refs #194] fix issues count 2012-02-28 20:28:11 +06:00
Alexander Machehin 0d75a37451 [refs #194] show page beta version 2012-02-28 20:05:18 +06:00
Alexander Machehin 27c85d32df [refs #194] create page; index pagination; some bugs 2012-02-27 22:10:12 +06:00
Alexander Machehin ecb29d1762 [refs #194] tags -> labels 2012-02-22 02:28:04 +06:00
Alexander Machehin 0ce76207af [refs #194] Add issue tags 2012-02-21 00:41:40 +06:00
Alexander Machehin 76beb6a277 [refs #194] add creator to issue 2012-02-19 23:28:43 +06:00
konstantin.grabar 08ffd8c25d [refs #123] Add wiki to ActivityFeed 2012-02-14 20:09:41 +04:00
Pavel Chipiga b7b69a86d8 Minor gems update. Sync with newest styles, javascripts, images. Refactor assets. Merge and fix wiki assets, temporary disable buggy ones. Change subscribeable_id type from string to decimal to avoid bugs. Auto convert commit subscribe subscribeable_id from hex to decimal. Refactor commentable. Fix bugs and some specs. Refactor application.yml. Refs #96 2012-02-14 18:05:41 +02:00
konstantin.grabar 96d3b35bdf [refs #123] Merge master into 123-activity-feed 2012-02-06 19:46:32 +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
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
konstantin.grabar 72fd821bc8 [refs #123] Add fixes for activity feed 2012-01-27 16:06:04 +04:00
konstantin.grabar 990a46018c [refs #123] Add base logic for activity feed 2012-01-25 12:31:49 +04:00
Alexander Machehin 6df1640485 [refs #114] fix logics 2012-01-24 18:18:39 +06:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06: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
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
konstantin.grabar f6e4de3b72 [refs #54] Fix issue assign user subscribe update filter 2012-01-12 17:07:54 +04:00
Alexander Machehin c18b71bf0b [refs #18] changed refs id to string 2012-01-12 00:10:23 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +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
konstantin.grabar 1c263c6e0a [refs #54] Notification DJ support. Routes fixes. 2011-12-28 14:47:54 +04: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