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

48 Commits

Author SHA1 Message Date
Alexander Machehin 02214dda09 [refs #90] fixed merge with master 2012-08-07 00:17:04 +06: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
Alexander Machehin 26617b7739 [refs #90] add close/reopen button 2012-07-12 20:15:28 +06:00
Alexander Machehin 65f94e763e [refs #90] add the commit merge message 2012-07-10 23:13:23 +06:00
Alexander Machehin 3290adb0b1 [refs #90] fixed merge ability 2012-07-10 22:58:39 +06:00
Alexander Machehin 07e02d9a17 [refs #90] modified Update commits button 2012-07-10 00:41:39 +06:00
Alexander Machehin d6df9953f2 [refs #90] fixed pull path 2012-07-04 16:35:35 +06:00
Alexander Machehin ef945278e8 [refs #90] refactoring check methods 2012-06-28 19:47:29 +06:00
Alexander Machehin ae4c8a6a5e [refs #90] fixed lost data after merge 2012-06-28 16:44:55 +06:00
Alexander Machehin ce0ff70561 [refs #90] fixed errors 2012-06-27 16:47:08 +06:00
Alexander Machehin 4f1e51a8af [refs #90] fix reset commit after automerge 2012-06-26 15:43:32 +06:00
Alexander Machehin 682f33a9bf [refs #90] view merged status 2012-06-13 23:52:11 +06:00
Alexander Machehin 9af3d22153 [refs #90] auto close after manual merge 2012-06-09 15:09:38 +06:00
Alexander Machehin 0b9c0fdd07 [refs #90] fixed rendering file rename 2012-06-08 01:19:18 +06:00
Alexander Machehin 8fadbf2d41 [refs #90] rewrite diff 2012-06-07 23:23:28 +06:00
Alexander Machehin 91bf65d65d [refs #90] comments for pull requests (slow version) 2012-06-05 18:08:52 +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 f44b9631ad [refs #90] add pull requests authorizations 2012-05-31 00:08:07 +06:00
Alexander Machehin 26baf999f4 [refs #90] diff stats 2012-05-29 23:09:43 +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 6623da9d71 [refs #90] fixed state_machine 2012-05-29 14:59:24 +06:00
Alexander Machehin 4f1d23a2a4 [refs #90] branch, merge validation 2012-05-24 23:10:49 +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
Alexander Machehin d643bb3cd0 [refs #90] try to prevent create same pull 2012-05-21 19:24:16 +06:00
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
Alexander Machehin f96990bd25 [refs #90] change view 2012-05-16 22:50:30 +06:00
Alexander Machehin bd2bb2b91f [refs #90] fixed merge 2012-05-12 22:34:27 +06:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +06:00
Alexander Machehin d4a5b78b21 [refs #90] add state setter 2012-05-10 15:42:25 +06:00
Alexander Machehin 381ae0a8b9 [refs #90] diff - dont work 2012-05-05 22:57:12 +06:00
Alexander Machehin eec083dc8b [refs #90] fixed tests 2012-05-02 21:36:39 +06:00
Alexander Machehin 30ac14a413 Merge branch '90-pull' of github.com:warpc/rosa-build into 90-pull 
Conflicts:
	app/models/project.rb
	app/models/pull_request.rb
	db/migrate/20120412173938_create_pull_requests.rb
	db/schema.rb
	spec/models/pull_request_spec.rb
 2012-05-02 15:18:56 +06:00
Alexander Machehin 4ad39b05c0 [refs #90] model PullRequest, tests 2012-04-28 23:30:54 +06:00
Alexander Machehin 598c072a80 [refs #90] add already state 2012-04-23 23:34:11 +06:00
Alexander Machehin a37bf7b50a Revert "[refs #90] more security" 
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
 2012-04-23 23:34:11 +06:00
Alexander Machehin 41fb4f2700 [refs #90] more security 2012-04-23 23:34:11 +06:00
Alexander Machehin fda1a847f5 [refs #90] some tests and questions 2012-04-23 23:34:10 +06:00
Alexander Machehin 58776a6e9e [refs #90] fixing pull methods 2012-04-23 23:34:10 +06:00
Alexander Machehin 71fdaa4e4d [refs #90] initial 2012-04-23 23:34:10 +06:00
Alexander Machehin 5dc8a4ead1 [refs #90] add already state 2012-04-20 22:23:28 +06:00
Alexander Machehin 61a27bbb7d Revert "[refs #90] more security" 
This reverts commit 09d9cdcb4a54082a31a5d04e972609e434ad41ec.
 2012-04-20 21:17:43 +06:00
Alexander Machehin aa83c14165 [refs #90] more security 2012-04-20 17:38:19 +06:00
Alexander Machehin b1365fc567 [refs #90] some tests and questions 2012-04-20 01:09:00 +06:00
Alexander Machehin c66931d347 [refs #90] fixing pull methods 2012-04-19 21:57:42 +06:00
Alexander Machehin d48a3413cc [refs #90] initial 2012-04-19 21:57:41 +06:00