Commit graph

1735 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
51f7d94991 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-09 20:05:07 +02:00
Dmitriy Zaporozhets
fc058605c2 fixed app crash if edit empty project from admin 2012-03-09 20:04:26 +02:00
Dmitriy Zaporozhets
3c3d26f3e7 Merge pull request #529 from abhid/branch-commit-url-fix
This might fix the issue with commits showing up in the format.
2012-03-08 02:08:25 -08:00
Ariejan de Vroom
748653beb0 Merge pull request #530 from yvmarques/patch-1
Changed the read to reflect the needed of mysql
2012-03-08 00:45:23 -08:00
Yvan
4a05890c4c Changed the read to reflect the needed of mysql 2012-03-08 09:44:26 +01:00
Dmitriy Zaporozhets
d4ebde9378 help updated 2012-03-08 00:15:31 +02:00
Dmitriy Zaporozhets
a9ef0bc343 test fix, css refactoring 2012-03-07 23:55:46 +02:00
Dmitriy Zaporozhets
6c83d9332d still use sqlite for travis 2012-03-07 21:35:00 +02:00
Dmitriy Zaporozhets
bed70a93f5 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-03-07 21:27:38 +02:00
Dmitriy Zaporozhets
05044658b3 Merge pull request #517 from gitlabhq/mysql_branch
Gitlab moved to mysql
2012-03-07 11:26:26 -08:00
Dmitriy Zaporozhets
04e9022e5a sqlite config example 2012-03-07 21:23:09 +02:00
Abhi Devireddy
32f04fc345 This might fix the issue with commits showing up in the format.
Needs to be tested.
2012-03-07 11:41:39 -06:00
Dmitriy Zaporozhets
c9b64974c0 increased dashboard width 2012-03-07 00:16:43 -08:00
Dmitriy Zaporozhets
57ce7124fc Fixed invalid commit show if git history broken 2012-03-07 00:15:43 -08:00
Dmitriy Zaporozhets
94befdd502 Events improved. Open/close issue, merge request events displayed 2012-03-07 00:13:43 -08:00
Dmitriy Zaporozhets
98b484b996 Merge pull request #520 from abhid/default-ssh-username
Removed hardcoded SSH Username on project create/edit form. Fixes Issue #493
2012-03-07 00:12:43 -08:00
Dmitriy Zaporozhets
5be94f4b67 Merge pull request #521 from abhid/testing-post-receive-hook
Adapt to new web_hook_data method. fixes #509
2012-03-07 00:12:06 -08:00
Abhi Devireddy
1bc0bd3244 Adapt to new web_hook_data method
Uses the first key that the user has for testing post receive hook.
2012-03-06 22:26:39 -06:00
Abhi Devireddy
a7c8ce6a4d Removed hardcoded SSH Username on project create/edit form 2012-03-06 17:39:07 -06:00
Dmitriy Zaporozhets
55e72f4cdf Gitlab moved to mysql 2012-03-06 19:54:59 +02:00
Dmitriy Zaporozhets
eb7bbedb20 Polishin & fixed tree switch 2012-03-06 00:29:40 +02:00
Dmitriy Zaporozhets
cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets
74f8bc7298 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-06 00:16:40 +02:00
Ariejan de Vroom
95b7987d6e Merge branch 'kleinmann-fix/web_hook_content_type' 2012-03-05 10:12:10 +01:00
Ariejan de Vroom
c5613f666f Merge branch 'fix/web_hook_content_type' of https://github.com/kleinmann/gitlabhq into kleinmann-fix/web_hook_content_type 2012-03-05 09:56:14 +01:00
Uwe Kleinmann
eac366a97b Sets correct content type on web hook execution. 2012-03-05 02:38:18 +01:00
Dmitriy Zaporozhets
0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
3fe9d2972f 2.3.0 pre 2012-03-04 12:35:15 +02:00
Dmitriy Zaporozhets
bc6915f24a projects page finished 2012-03-04 03:00:19 +02:00
Dmitriy Zaporozhets
d6b051c5be get rid of sidebar 2012-03-03 13:03:03 +02:00
Dmitriy Zaporozhets
62707bb730 fixed invalid issues link on dashboard 2012-03-03 11:23:03 +02:00
Dmitriy Zaporozhets
6de7dc1e67 New projects page 2012-03-03 00:09:17 +02:00
Dmitriy Zaporozhets
9f1a5f415a Key uniq method refactored 2012-03-02 22:44:30 +02:00
Dmitriy Zaporozhets
2d162ff9ac Fix for mysql database cause key is a reserved word 2012-03-02 22:33:29 +02:00
Dmitriy Zaporozhets
770f18ac50 Prevent Application from crash cause of charloc_cholmes error 2012-03-02 19:42:28 +03:00
Dmitriy Zaporozhets
b603e0dc45 Fixed spec 2012-03-01 22:56:24 +02:00
Dmitriy Zaporozhets
5263dd4297 Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled 2012-03-01 22:43:04 +02:00
Dmitriy Zaporozhets
00028702fc design tab improved. Themes added 2012-03-01 21:23:50 +02:00
Dmitriy Zaporozhets
ed75afbb10 should up to 3.0.1 2012-03-01 21:02:59 +02:00
Dmitriy Zaporozhets
375ebcabfd improved activity ui 2012-03-01 20:47:57 +02:00
Dmitriy Zaporozhets
c94159ab08 improved dashboard 2012-03-01 20:40:32 +02:00
Ariejan de Vroom
219ac18980 Updated specs for post_receive worker 2012-03-01 16:43:04 +01:00
Ariejan de Vroom
4e5597b852 Merge branch 'miks-deploy_keys_nonunique' 2012-03-01 16:02:25 +01: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
Ariejan de Vroom
bfe0906f2f Merge remote-tracking branch 'upstream/master' 2012-03-01 15:09:23 +01:00
Ariejan de Vroom
df6f748179 Merge pull request #459 from patthoyts/pt/gravatar-fix
Generate consistent gravatar hash values as per documentation.
2012-03-01 06:03:48 -08:00
Dmitriy Zaporozhets
1924de91c5 fixed compare for push 2012-02-29 23:34:06 +02:00
Dmitriy Zaporozhets
f6f939eeb8 UI mars theme updated. search field improved 2012-02-29 23:21:23 +02:00
Dmitriy Zaporozhets
25bde28d13 Fixed tests. removed delegate to id 2012-02-29 23:04:09 +02:00
Dmitriy Zaporozhets
bb164ebf1b Send author to post hook. Display push activity to dashboard 2012-02-29 22:38:24 +02:00