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

117 commits

Author SHA1 Message Date
Riyad Preukschas 9f1e9f11f1 Merge pull request #2346 from sodabrew/omniauth_configs 
Allow the OmniAuth provider args parameter to be passed through
 2013-01-16 15:58:53 -08:00
Riyad Preukschas 76329a46a3 Fix settings 2013-01-16 23:54:48 +01:00
Riyad Preukschas eea43c9412 Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group 2013-01-16 23:20:47 +01:00
Riyad Preukschas 0dd8a26a3a Fix satellite path settings 2013-01-16 17:00:38 +01:00
Cyril 31e338b8fd add default for Settings['satellites'] 2013-01-16 16:11:40 +01:00
Dmitriy Zaporozhets c9e6818ab6 Store repo satellites outside of tmp directory 2013-01-16 13:30:31 +02:00
VonC 471b5910a6 Fix git group detection for gitolite ssh user. 
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.

That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).

M config/gitlab.yml.example:
  Add 'group' in 'git' section
  Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
  Check that gitolite.ssh_user *group* is the one defined in git.group.
  Make sure to default to 'git' as the expected group
    if said group is undefined in the config.
  Note: uses a more complete regexp for the group detection
        (the group can start, end or be in the middle or the list of groups
         of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
  Add default values for gitolite.group and gitlab.user
 2013-01-14 11:44:27 +00:00
James Newton 2b38c8a156 remove passenger_fix.rb, which due to the recent removal of Resque in favor of sidekiq breaks gitlab in passenger 2013-01-09 22:17:03 -06:00
Dmitriy Zaporozhets 9773ccc451 sidekiq with green tests 2013-01-09 09:14:05 +03:00
Dmitriy Zaporozhets c7bb3a1f72 sidekiq 2013-01-09 08:14:05 +03:00
Chris Frohoff 21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Jakub Jirutka a1434ff50b Fix shared Redis connection issue on Passenger 2012-12-25 23:14:00 +01:00
Dmitriy Zaporozhets 3c1022f9b1 No resque errors 2012-12-25 16:18:22 +02:00
Dmitriy Zaporozhets 64db738f9d Trying to fix resque issue 2012-12-25 15:53:50 +02:00
Dmitriy Zaporozhets 49e73f8ac1 Fixed syntax error in config -> settings 2012-12-24 21:29:53 +02:00
Dmitriy Zaporozhets 0dbb369ace Cleanup deprecated configs 2012-12-24 21:25:33 +02:00
Aaron Stone aec1a84042 Allow the OmniAuth provider args parameter to pass through as either an Array or a Hash. 2012-12-23 16:12:53 -08:00
Riyad Preukschas 757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Riyad Preukschas b2e46f44ce Refactor Settings initializer 
All overrides are marked as deprecated.
Default settings are at the bottom.
 2012-12-20 16:54:28 +01:00
Sergey Linnik 0aa7f79ca4 allow customize gravatar url 2012-12-07 00:44:22 +04:00
Riyad Preukschas 8b4010397c Register diff mime type 2012-11-22 20:22:44 +01:00
Alexander Simonov 18bc873d53 Resque must be running in the own namespace 2012-11-20 18:59:37 +02:00
Alexander Simonov 10d8b77b50 Clean old rails2 style code 2012-11-20 18:59:28 +02:00
Riyad Preukschas 20189f84ee Update gems 2012-11-18 21:51:53 +01:00
Saito f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00
Valeriy Sizov 0d4568db78 gitolite custom config 2012-11-07 00:47:33 +02:00
Robert Speicher f61ca97648 Add quiet_assets gem, remove initializer 2012-11-01 16:45:31 -04:00
Marin Jankovski d75cc7eafd Display https as repo clone indicator and prevent modification of web_protocol variable. 
Rewrite build_url, use web_protocol for repo indicator.

Explicitly initialize custom port to make the logic obvious.
 2012-10-21 15:48:34 +02:00
Dmitriy Zaporozhets 2ff36e74eb Merge pull request #1564 from dosire/cookie_secure_setting 
Secure and httponly options on cookie.
 2012-10-21 06:14:36 -07:00
Saito 8880c06d3b disable annoying rails assets log messages 2012-10-14 00:02:01 +08:00
Andrey Kumanyaev 75e6eb59ec patch rails to ignore text limit 2012-10-10 13:17:48 +04:00
Robert Speicher afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher 99d391332f Add a "patch" MIME type, and render it like a normal view in Commit#show 2012-09-26 16:32:23 -04:00
Robert Speicher 9d394250a8 Add an inflector to mark "commits" as uncountable 2012-09-26 16:32:23 -04:00
Marin Jankovski a58d311262 Secure and httponly options on cookie. 2012-09-26 16:02:31 +02:00
Robert Speicher 6ddbee5d89 Consolidate all Resque-related initializers into "4_resque" 2012-09-22 11:26:22 -04:00
Robert Speicher 2cd0caaf73 Rename 4_resque_queues initializer to 4_resque 2012-09-22 11:20:04 -04:00
Robert Speicher bfed07ee20 Add an initializer to allow custom Resque configs 2012-09-18 21:45:09 -04:00
Robert Speicher 0d77209ea0 Be more resilient in the case of missing omniauth settings 
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
 2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets 486de8c3f4 Refactoring auth 2012-09-12 07:48:22 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +03:00
randx a56cec1132 specify gitolite-admin owner in config 2012-08-29 02:08:39 +03:00
Nihad Abbasov 6817a6a295 add kaminari config with default and max per_page values 2012-09-03 04:22:49 -07:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
LeonB c81d4ab4a9 Fixed some hardcoded paths 
New config option: git_hooks_path
 2012-08-28 10:57:23 +02:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
Dmitriy Zaporozhets 6e520d9cae Merge pull request #1297 from SaitoWu/issues/1269 
fix git push body bigger than 112k problem
 2012-08-25 06:15:18 -07:00
Saito 74d65bb823 fix git push body bigger than 112k problem 2012-08-25 15:24:21 +08:00
Robert Speicher 2c128f3874 Remove rails-footnotes gem and its related files 2012-08-23 19:20:28 -04:00