deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4184 commits 6 branches 43 tags 25 MiB
Commit graph

159 commits

Author SHA1 Message Date
Nihad Abbasov
0833b7ec5b oops, uncomment authentication_token 2012-07-06 21:33:08 +06:00
Nihad Abbasov
6533711825 enable lockable strategy for users 2012-07-06 00:05:31 -07:00
Nihad Abbasov
2abd054b0c update devise 2012-07-05 23:50:24 -07:00
randx
2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
Dmitriy Zaporozhets
50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets
65382133d5 Merge pull request #761 from michaeltrimm/patch-1 
Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that...
 2012-05-13 08:20:14 -07:00
Robb Kidd
00b4c4571c Add to schema.rb the increased MR text column size. 
This change was made in a migration in commit 17a88bb6a2.
Because the schema.rb is checked in, the column size increase should
be here, too.
 2012-05-10 21:54:22 +00:00
michaeltrimm
b8c69c6f34 Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that causes the rake to fail and the system not properly install the default user and password. 2012-04-30 11:33:00 -03:00
Dmitriy Zaporozhets
7058258a2a Fixed db_schema & reordered rake tasks 2012-04-21 12:45:43 +03:00
Dmitriy Zaporozhets
08994f3f60 Merge remote-tracking branch 'origin/merge_button' 
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
 2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets
95fde9bd7a Projects page as dashboard. Old dashboard removed 2012-04-14 11:20:45 +03:00
randx
497ee5fbbc Ability to block user 2012-04-13 08:12:34 +03:00
Dmitriy Zaporozhets
2587de74df Minor fixes 2012-04-10 20:06:17 +03:00
randx
627efddf63 migrated to bootstrap 2 2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets
d98b183361 first pack of tests for milestones 2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets
23d950855d Milestone basic scaffold 2012-04-09 00:28:58 +03:00
Dmitriy Zaporozhets
86676476e6 Handling big commits & big diff 2012-04-06 01:00:15 +03:00
Dmitriy Zaporozhets
17a88bb6a2 Fix mysql issue fix broken diff for Merge Request 2012-04-06 00:22:48 +03:00
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
Dmitriy Zaporozhets
9a2a861276 Design tab for profile. Colorscheme as db value 2011-12-20 22:47:09 +02:00
Dmitriy Zaporozhets
d9cfb7985e dev seeds & dev scripts 2011-12-15 23:04:59 +02:00
Ariejan de Vroom
edab46e9fa Added web hooks functionality 
This commit includes:

 * Projects can have zero or more WebHooks.
 * The PostReceive job will ask a project to execute any web hooks defined for that project.
 * WebHook has a URL, we post Github-compatible JSON to that URL.
 * Failure to execute a WebHook will be silently ignored.
 2011-12-14 17:38:52 +01:00
Alexander Randa
c532dfc1bb Demo issues title update 2011-12-13 20:51:22 +03:00
Ariejan de Vroom
bc0155fbaa First attempt at a post-receive hook that posts directly to Resque 2011-12-13 01:03:26 +01:00
Dmitriy Zaporozhets
8e0126e9ec Merge branch 'issue_dashboard' into improved_dashboard 2011-12-08 15:05:01 +02:00
Ariejan de Vroom
f512418b27 Added "Issues" dashboard 
This shows issues assigned to you, across all your projects, in one
place.

References #173
 2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets
d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
2552a877df updated seeds for new permissions, issue seeds added 2011-12-07 22:55:09 +02:00
Dmitriy Zaporozhets
cb021e5831 repo & project access separated. critical gitolite bugfix 2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets
8f4a0bd174 fix filters & seeds 2011-12-04 22:34:39 +02:00
Dmitriy Zaporozhets
03e51c3058 fixtures added 2011-12-04 22:19:49 +02:00
Dmitriy Zaporozhets
6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
gitlabhq
ee2d3de1a6 ability to attach branch to issue 2011-11-24 08:08:20 -05:00
gitlabhq
3538ae8500 travis conf 2011-11-15 08:51:43 -05:00
Nihad Abbasov
368deb5992 clean up whitespace from project 2011-11-15 12:34:30 +04:00
Nihad Abbasov
003bf61258 add auth token for users 2011-11-15 11:08:05 +04:00
Nihad Abbasov
f476c42d00 remove content column from issues 2011-11-11 13:35:02 +04:00
Aleksei Kvitinskii
b946da4469 added tags to form 2011-11-04 10:11:14 +02:00
Aleksei Kvitinskii
6977150f04 integrate tags plugins 2011-11-04 09:44:43 +02:00
gitlabhq
3fa770dd10 Merge branch 'new_issue' into dev 2011-10-28 12:26:25 +03:00
gitlabhq
a017181339 new issue format 2011-10-28 12:22:09 +03:00
Nihad Abbasov
89fa800e28 Merge branch 'refs/heads/snippets_expiration' into dev 
Conflicts:
	db/schema.rb
 2011-10-28 00:28:37 +05:00
gitlabhq
56d9761844 moving out of body 2011-10-27 18:46:30 +03:00
gitlabhq
f4e7ad7a4b fixed limit 2011-10-27 17:41:10 +03:00
gitlabhq
9611a27e0c note as text 2011-10-27 17:33:20 +03:00
Nihad Abbasov
117d1e90fd add expires_at column to snippets 2011-10-27 10:20:45 +05:00
Nihad Abbasov
d62200cad4 clean-up code 
* Remove trailing whitespace
  * Converts hard-tabs into two-space soft-tabs
  * Remove consecutive blank lines
 2011-10-26 18:46:25 +05:00
gitlabhq
9afee5ad52 Add critical status to issues 2011-10-25 07:34:02 +03:00
gitlabhq
35d24b3928 cleaning 2011-10-22 14:08:03 +03:00
gitlabhq
1c26607290 corrected last migration 2011-10-22 14:08:03 +03:00
gitlabhq
9fa4df16ec now you can view comrade profile info #134 2011-10-22 14:08:03 +03:00