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

2324 commits

This branch
This branch
All branches
Author SHA1 Message Date
randx a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Dmitriy Zaporozhets 860fa1163a Merge pull request #1117 from patthoyts/pt/user-form 
Fix english on the edit user form.
 2012-07-20 14:23:49 -07:00
Pat Thoyts 787e5e94ac Fix english on the edit user form. 
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-20 22:18:42 +01:00
Ian Morgan 04a85f4582 Show wiki comments for all revisions 2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets 9267cb04b0 Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq 2012-07-20 14:24:56 +00:00
Dmitriy Zaporozhets 791208431c Box shadow for boxes 2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets 3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Dmitriy Zaporozhets 60ee383eb9 Enable observe for system hooks 2012-07-20 12:08:59 +03:00
Dmitriy Zaporozhets 3063af5adc BaseContext 
Controllers refactoring with contexts
Move commit compare logic to model
 2012-07-20 08:39:34 +03:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov d9cd6269e9 System Hooks: move callback to observer 2012-07-20 01:01:29 +03:00
gliptak 44ec5579bd Display configured git repository location on error page (this is partially addressing issue #1072) 2012-07-19 12:39:02 -03:00
Dmitriy Zaporozhets 1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Dmitriy Zaporozhets 214fdd2d2f Ignore backups dir 2012-07-19 12:52:28 +03:00
Dmitriy Zaporozhets 30eee67726 Merge pull request #1106 from mrichardson-shelter/backup-create-fix-mysql-syntax-error 
Fixing MySQL syntax error
 2012-07-19 02:46:14 -07:00
Valeriy Sizov 86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov 655418bed2 System hooks: fix broken tests 2012-07-19 00:25:10 +03:00
Valeriy Sizov f5908cef19 System Hook: implemented 2012-07-19 00:25:10 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Valeriy Sizov 65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03:00
Valeriy Sizov 72a571724d Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project 
show flash notice after deletion of a project
 2012-07-18 05:35:42 -07:00
Valeriy Sizov 3ac840ff06 Merge pull request #1100 from patthoyts/pt/ldap-no-email 
Improve handling of misconfigured LDAP accounts.
 2012-07-18 05:17:14 -07:00
Michael Richardson 0456ceddb4 Fixing MySQL syntax error 2012-07-18 11:59:32 +01:00
Dmitriy Zaporozhets 8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets 494cd02b38 Colored labels for events on dashboard 2012-07-17 08:21:16 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
Dmitriy Zaporozhets 80f2ef2d02 MR index pollished 2012-07-17 08:17:16 +03:00
Pat Thoyts f322975c50 Improve handling of misconfigured LDAP accounts. 
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-16 23:31:28 +01:00
moregeek 990b9217d9 show flash notice after deletion of a project 2012-07-16 14:01:32 +02:00
Dmitriy Zaporozhets 2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Valeriy Sizov 244a1cad62 Merge pull request #1045 from tobert/patch-1 
The gitlab.pub file probably shouldn't be world readable, but let's star...
 2012-07-16 02:29:02 -07:00
Valeriy Sizov 5265a88d75 Merge pull request #1090 from rjmooney/patch-1 
Clarify the nginx configuration.
 2012-07-16 02:18:05 -07:00
Valeriy Sizov e184df9ce7 Merge pull request #1091 from asfaltboy/patch-1 
Add step to make sure tmp directory exists in /home/gitlab/gitlab/
 2012-07-16 02:15:38 -07:00
Valeriy Sizov 5ef4f8975f Merge pull request #1093 from hfase01/master 
Updated libreadline in docs.
 2012-07-16 02:12:55 -07:00
Hans Fase f003abf729 libreadline-gplv2-dev >> libreadline6-dev 2012-07-15 17:17:46 -03:00
Pavel Savchenko f2da12e960 Add step to make sure tmp directory exists in /home/gitlab/gitlab/ (since the step Setup DB fails if it doesn't. see issue #1038 for more detials. 2012-07-14 10:09:26 +03:00
rjmooney 491d674a96 Clarify the nginx configuration. 2012-07-13 10:26:52 -07:00
Nihad Abbasov 652d28f56b Merge pull request #1087 from m16a1/patch-1 
Fix typo in spec
 2012-07-13 06:12:55 -07:00
m16a1 a46a172ad9 Update master 2012-07-13 17:10:30 +04:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
randx b8425cf173 Last push widget improved 2012-07-10 21:26:41 +03:00
Dmitriy Zaporozhets 78af4683b1 Merge pull request #1075 from VonC/master 
Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.
 2012-07-11 07:50:22 -07:00
VonC 2600e80b41 Look for 'gitolite_admin_uri' in the right section 
of 'gitlab.yml'.

gitlabhq\config\initializers\1_settings.rb looks for
'gitolite_admin_uri' in the 'git' section of 'gitlab.yml'

Actually, that setting is in the 'git_host' section.
If not fixed, the 'gitolite_admin_uri' would always be equals to
'git@localhost:gitolite-admin', even if the administrator wants
to have another user than 'git' in charge of that repo.
 2012-07-11 16:37:34 +02:00
Dmitriy Zaporozhets bb7dde0d94 Merge pull request #1065 from moregeek/rake_task_for_backup_whole_gitlab 
add: rake task to backup/restore gitlab db and repos
 2012-07-10 23:57:20 -07:00
randx d3862c0e57 CSS improvements & refactoring 2012-07-10 20:16:23 +03:00
Stefan Morgenthaler 4dae41d5dc Changes done as per feedback 2012-07-10 16:12:19 +02:00
Valeriy Sizov b58326afc6 Merge pull request #1069 from drt24/patch-1 
Should append to .profile rather than overwriting it as it might have ex...
 2012-07-10 06:16:42 -07:00
Daniel Thomas 4a21f09029 Should append to .profile rather than overwriting it as it might have existing contents 2012-07-10 12:47:30 +02:00
Dmitriy Zaporozhets 1dca367f22 Merge pull request #1067 from SaitoWu/bugfix/encoding 
fix blame encoding error.
 2012-07-10 01:08:31 -07:00