Commit graph

91 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 90748cf724 Merge Button v1 complete 2012-03-30 20:49:34 +03:00
randx 411d84f385 Better merge handling. show if MR can be accepted or not 2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets cd74f9da91 Link for auto merge, db field for MR 2012-03-30 00:27:42 +03:00
Valery Sizov 442d5dbef2 fixed yellow background in markdown documents 2012-03-27 23:04:21 +03:00
Dmitriy Zaporozhets 8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03:00
Steven Verbeek 6c40e89853 merging upstream changes 2012-03-24 00:36:54 -03:00
Dmitriy Zaporozhets 1c6df8e075 Improved profile & team member show 2012-03-24 01:01:36 +02:00
randx 1fefd7cbd3 Fix db seeds for dev 2012-03-22 00:09:55 +02:00
Steven Verbeek 35d0de8f36 merging upstream changes 2012-03-19 21:57:29 -03:00
Steven Verbeek 7e2f489017 db migrate file 2012-03-17 01:17:37 -03:00
Steven Verbeek 94fd9a6e47 Added issue description. 2012-03-17 00:24:40 -03:00
Dmitriy Zaporozhets a4993f16c0 Fixed migration, test for MR 2012-03-15 19:39:03 +02:00
Dmitriy Zaporozhets 5a3f23f395 Persist Merge Request diff. Auto merge request close on push 2012-03-15 00:57:43 +02:00
Dmitriy Zaporozhets 3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets cd06d6edac Project model refactored 2012-03-09 21:43:46 +02:00
Dmitriy Zaporozhets 94befdd502 Events improved. Open/close issue, merge request events displayed 2012-03-07 00:13:43 -08:00
Dmitriy Zaporozhets 0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets 00028702fc design tab improved. Themes added 2012-03-01 21:23:50 +02:00
Ariejan de Vroom b0ce61c4f2 Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
Added/fixed specs
Update spec/factory to allow Factory#new without opts

Conflicts:
	app/models/key.rb
2012-03-01 16:00:14 +01:00
Dmitriy Zaporozhets dcdb2fdfdb Observe issue, merge request, note creation - create event 2012-02-28 16:01:14 +02:00
Dmitriy Zaporozhets a847501fd2 Event entity created 2012-02-28 15:09:23 +02:00
vsizov 621bfdb4aa wiki: rspec 2012-02-21 20:18:06 +03:00
vsizov bdc42488e9 wiki is done 2012-02-20 20:16:55 +03:00
Valery Sizov 85974948e7 Wiki: history 2012-02-19 21:52:05 +02:00
Valery Sizov 12ea84fe46 fix shema after rebase 2012-02-19 19:54:00 +02:00
Valery Sizov eacea15a21 wiki base sceleton 2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets 9a24ccdea1 Fixed mistype in permissions, Fixed migration 2012-02-16 09:04:56 +02:00
Dmitriy Zaporozhets 9dfbcc6ef3 Fixed permission migration 2012-02-16 09:04:55 +02:00
Dmitriy Zaporozhets 1c62ec09b0 4 roles permission system 2012-02-16 09:03:55 +02:00
Dmitriy Zaporozhets 37224dc9c1 ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only 2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets fbd5296e32 layout refactored 2012-02-09 09:59:04 +02:00
Dmitriy Zaporozhets 6c416aaac8 Issues, MR, Wall can be enabled/disabled per project 2012-02-06 19:40:32 +02:00
Dmitriy Zaporozhets 7157305d5e cleaning dashboard & tags 2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets 98d6492582 removed broken migration 2012-01-22 20:52:06 +02:00
Dmitriy Zaporozhets f4e3ec29c4 fixed commit commenting 2012-01-21 14:54:32 +02:00
Valery Sizov 4b06d82f3d fix noteable key type 2012-01-19 22:54:22 +02:00
Valery Sizov e46dab1ac5 add db indexes 2012-01-19 22:54:22 +02:00
Valery Sizov fc36df92da sql for mysql compatible 2012-01-19 21:44:10 +02:00
Dmitriy Zaporozhets cbd78922ee Merge branch 'deploy_keys'
Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb
2012-01-14 21:26:35 +02:00
Dmitriy Zaporozhets 7f92534f76 pybments.rb version up. gitignore improved 2012-01-12 00:33:54 +02:00
Dmitriy Zaporozhets 99bb4a153d per line comments w/o tests & with dirty code 2012-01-12 00:26:01 +02:00
Dmitriy Zaporozhets 9da4d06a87 per line comments display 2012-01-10 22:08:46 +02:00
Valery Sizov 212f400d67 fix bug #322 2012-01-03 23:39:03 +02:00
miks 99b8b577e9 DeployKey moved to Key model 2011-12-31 16:24:10 +02:00
Dmitriy Zaporozhets d8247012b5 repositories tab specs 2011-12-31 12:52:01 +02:00
miks afa7f3a17a DB schema updated 2011-12-29 22:00:50 +02:00
miks f8ad4d2b42 Merge branch 'master' into deploy_keys
Conflicts:
	app/models/project.rb
2011-12-29 21:46:21 +02:00
miks 723104c45f Initial deploy_key feature commit 2011-12-29 21:44:16 +02:00
Valery Sizov 676fa16ceb commented some tests 2011-12-27 23:49:16 +02:00
Valery Sizov 66fb3909a5 Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks
Conflicts:
	app/models/project.rb
	config/routes.rb
	db/schema.rb
2011-12-27 23:21:26 +02:00