home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
1914 Commits
Author SHA1 Message Date
Jacob Vosmaer 090ed21e6f Batch key import requires gitlab-shell 1.8.5 2014-03-14 15:58:47 +01:00
Jacob Vosmaer 779fa4a7b7 Use batch_add_keys in rake gitlab:shell:setup 2014-03-14 15:49:11 +01:00
Dmitriy Zaporozhets a9f2903e86 Change project lookup order for api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:52 +02:00
Dmitriy Zaporozhets fa3c087a4c Clear rake task only if defined 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 14:23:28 +02:00
Dmitriy Zaporozhets 1ec106b853 Merge branch 'ldap_connections' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-14 12:58:43 +02:00
Dmitriy Zaporozhets bce8edbbcc Require gitlab-shell v1.8.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:57:26 +02:00
Dmitriy Zaporozhets b007cadf55 Fix project creation test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 12:19:02 +02:00
Dmitriy Zaporozhets 8839339ee3 Override rake test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 11:06:10 +02:00
Dmitriy Zaporozhets f6f80659ec Override rake spec and rake spinach tasks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 10:44:16 +02:00
Jacob Vosmaer 56df3dbff2 Add Gitlab::LDAP::Access.open 
This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
 2014-03-14 08:55:50 +01:00
Jacob Vosmaer af53aa9072 Add Gitlab::LDAP::Adapter.open 
This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
 2014-03-14 08:53:46 +01:00
Jacob Vosmaer 5a616649b5 Allow passing an adapter to Gitlab::LDAP::Person 2014-03-14 08:52:57 +01:00
Dmitriy Zaporozhets 6f5a9b4110 Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username 
Also expose username for the /discover endpoint
 2014-03-13 22:40:01 +02:00
Dmitriy Zaporozhets 3082d2a4be Merge branch 'tighten_logrotate' into 'master' 
Tighten Logrotate
 2014-03-13 20:07:57 +00:00
Dmitriy Zaporozhets b0a86cb3ba Use gitlab:setup inside gitlab:test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 11:33:33 +02:00
Dmitriy Zaporozhets 46cc3b22c9 Add mysql limits to db during setup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 10:47:53 +02:00
Jacob Vosmaer c22646d2a4 Logrotate daily, keeping 90 days of old logs 
Also remove the 'delaycompress' option which is not needed because we
use 'copytruncate'.
 2014-03-12 15:26:39 +01:00
Jeroen van Baarsen f9c4bb5638 Changed limits to a higher order 2014-03-12 08:13:27 +01:00
Jeroen van Baarsen 71b1030bf7 Added rake task to add limits back in mysql 2014-03-11 19:23:02 +01:00
Dmitriy Zaporozhets f16de8ac8c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-11 11:29:18 +02:00
Dmitriy Zaporozhets 767f7d9ae7 Merge branch 'ldap-code' into 'master' 
LDAP code from EE
 2014-03-11 09:28:41 +00:00
Dmitriy Zaporozhets ae68a66a98 Merge pull request #6478 from infoMantisGmbH/master 
Allow underscore as the first char for project names.
 2014-03-11 10:13:52 +02:00
Dmitriy Zaporozhets 92a928468f Merge branch 'catch_missing_command' into 'master' 
Catch missing commands in Rake tasks
 2014-03-10 18:48:31 +00:00
Jacob Vosmaer ad71eca8bb Catch missing commands in rake tasks with '' 2014-03-10 18:14:59 +01:00
Dmitriy Zaporozhets 0aa389b491 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-10 17:34:09 +02:00
Dmitriy Zaporozhets ea432f6032 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-03-10 17:33:57 +02:00
Dmitriy Zaporozhets dca8f6d4a6 Merge pull request #6492 from tsigo/gitlab-shell-custom-path 
Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
 2014-03-10 17:30:21 +02:00
Dmitriy Zaporozhets b1ff8e31b1 Add ldap check in application_controller and internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:10:23 +02:00
Dmitriy Zaporozhets 0fdab6a747 Remove copyright 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:09:45 +02:00
Dmitriy Zaporozhets daa7f077db Port LDAP code from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 14:48:08 +02:00
dosire 6bf5215b23 Some people are getting the error 'The remote end hung up unexpectedly' due to large chuncks. 2014-03-10 09:11:19 +01:00
Kyle FazzariandKyle Fazzari 058aae5940 Fixed Unicorn-Sidekiq confusion in GitLab init script. 
There were a few places in the included init script where
Unicorn was referred to as Sidekiq and vice-versa.

This fixes #126.
 2014-03-08 09:07:59 -05:00
Robert Speicher c5f76e5939 Popen (at least on OSX) expects an Array, not a String 
This was causing the gitlab:check task to exit prematurely with the
error "System commands must be given as an array of strings."
 2014-03-07 21:39:48 -05:00
Robert Speicher 30f8713aa1 Respect custom gitlab_shell path in gitlab:gitlab_shell:check task 
Prior to this change, if I customized the config value of
`gitlab.gitlab_shell.path`, the check would ignore this value in favor
of `"~<gitlab.gitlab_shell.ssh_user>/gitlab-shell/"` resulting in a
failed check when the configuration was otherwise valid.
 2014-03-07 21:05:56 -05:00
mk 61a72bc2e2 Allow underscore as the first char for project names. 
Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
 2014-03-06 14:08:40 +01:00
Dmitriy Zaporozhets f1d8efb770 Merge branch 'shell_new_style' into 'master' 
Use new style shell commands
 2014-03-05 10:45:46 +00:00
Greg Messner 7e14f86c71 Added description parameter support to Create and Update MR API endpoints (issue-110). 2014-03-03 23:08:39 -08:00
Arif Ali affc37ad02 change deploy.sh without mysql, now that we are moving to postgres 2014-03-04 00:10:49 +00:00
Jacob Vosmaer d6b0ac96f7 Invoke Kernel#system with separate arguments 2014-03-03 08:40:30 +01:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
Dmitriy Zaporozhets 54e40241f6 Merge branch 'backup_uploads_symlink' into 'master' 
Backup Uploads Symlink
 2014-03-01 12:55:13 +00:00
Jacob Vosmaer 75f274b750 Use Gitlab::VERSION to version backups 
Previous to this commit, backups were tied to the git revision (SHA1) of
the app at the time the backup:create command was invoked. If the SHA1
at the time of restore was different, the script would refuse to restore
the backup.  This commit loosens this tie so that the backup script only
complains if the value of the Gitlab::VERSION constant is different
between the time of backup and the time of restore.
 2014-02-27 14:30:41 +01:00
Dmitriy Zaporozhets 0a963ee15a Merge branch 'pg_force_restore' into 'master' 
Pg Force Restore
 2014-02-27 12:27:30 +00:00
Dmitriy Zaporozhets 981deddfce Merge branch 'highlight_html_escape' into 'master' 
Enable html_escape for code blocks highlighted in markdown

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
 2014-02-27 11:13:46 +00:00
Dmitriy Zaporozhets c94dc3de78 html_escape is private for rails 4.0.2 :( 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 11:12:12 +02:00
Dmitriy Zaporozhets 4d896a2b86 Enable html_escape for code blocks highlighted in markdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 09:38:11 +02:00
Dmitriy Zaporozhets b155a44ef4 Merge branch 'backup_restore_hooks_bug' into 'master' 
Fix backup/restore git hooks bug
 2014-02-26 20:54:23 +00:00
Jacob Vosmaer 8fe10e642a Empty the database during Postgres backup restore 
The expected behavior during a GitLab backup restore is to overwrite
existing database data. This works for MySQL because the output of
mysqldump contains 'DROP TABLE IF EXISTS' statements. pg_dump on the
other hand assumes that one will restore into an empty database. When
this is not the case, during the restore with psql some of the data will
be skipped if existing data is 'in the way'. By first invoking `rake
db:schema:load` during a Postgres GitLab backup restore, we make sure
that all important data is correctly restored.
 2014-02-26 18:26:31 +01:00
Jacob Vosmaer 91c70c5b1c Use gitlab_shell.path to invoke rewrite-hooks.sh 
The backup restore code for repositories was assuming that gitlab-shell
is installed in /home/git/gitlab-shell. This commit changes that to use
the configuration setting from gitlab.yml that specifies the path where
gitlab-shell is installed.
 2014-02-26 17:32:52 +01:00
Jacob Vosmaer a47a6f2afd Support symlinked public/uploads for backp restore 
The backup restore code moves any existing uploads directory out of the
way before restoring the copy from the backup. If public/uploads was a
symlink, this move would replace the symlink. This commit avoids this
issue by first resolving any symlinks in the uploads path.
 2014-02-26 17:26:48 +01:00