root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
12,935 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

165 Commits

Author SHA1 Message Date
Robert Djurasaj bc16f81321 Update time zone rake task for production. Resolves #8387 2014-11-25 11:18:56 -07:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Marin Jankovski d504ca8a0c Add settings to disable email sending from GitLab. 2014-10-27 13:02:12 +01:00
Sullivan SENECHAL 593a287c8d Add timezone configuration to gitlab.yml 2014-10-21 11:27:16 +02:00
Dmitriy Zaporozhets e3bd17a7ba Merge branch 'feature-multiple-ldap-servers' into 'master' 
Feature multiple ldap servers

Update the code so Gitlab-EE can support multiple LDAP servers

See merge request !1172
 2014-10-14 15:01:37 +00:00
Jan-Willem van der Meer b4f7b387d0 Explain new configuration options. 
And add some advertisement to use GitLab EE
 2014-10-14 15:03:53 +02:00
Jan-Willem van der Meer fedb223b09 Add valid LDAP server for testing 2014-10-14 13:52:15 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Marin Jankovski 1d432e96bc Add a link to libravatar doc in gitlab.yml.example. 2014-10-14 12:31:47 +02:00
Jan-Willem van der Meer 3cd5abf635 Add config changes for mutliple LDAP support (EE only) 2014-10-13 13:56:54 +02:00
Dmitriy Zaporozhets 73b92f85bc Merge branch 'add_active_directory_ldap_option' into 'master' 
Add active directory ldap option

Fixes #1557

See merge request !1139
 2014-10-01 07:04:08 +00:00
Marin Jankovski f7aba277e7 Add option to gitlab config to specify if LDAP server is active directory. 2014-09-30 12:07:31 +02:00
Jacob Vosmaer f778387e38 Add region to backup upload config in gitlab.yml 2014-09-30 12:05:07 +02:00
Jacob Vosmaer e1f6fa6f18 Add backup upload support to the rake task 2014-09-29 15:03:08 +02:00
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Ben Bodenmiller 5d5d4ef91a simplify HTTPS setup details 
also adds comment about updating nginx files during upgrades
 2014-09-07 15:31:13 -07:00
Jacob Vosmaer 47ac48c031 Disable allow_username_or_email_login in example 
The example LDAP configuration in gitlab.yml enables the
allow_username_or_email_login setting. Because the effect of this
setting is somewhat counterintuitive, I propose we make 'false' the
example default. The settings initializer already sets this setting to
'false'.
 2014-08-29 15:38:05 +02:00
Ben Bodenmiller 0a0cbe1274 make configuration comment spacing consistent 2014-08-22 17:20:31 -07:00
Dmitriy Zaporozhets 45da59daab
Mention username option for developers in gitlab.yml 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-14 15:15:48 +03:00
Dmitriy Zaporozhets f82b9e48ec Dont stub gitlab-shell calls. Make test environment closer to real one 2014-07-31 15:39:01 +03:00
Jacob Vosmaer e03ab14f78 Add a tip on how to test regular expressions 2014-07-25 18:26:04 +02:00
Dmitriy Zaporozhets ed234e344e Merge pull request #7316 from ayr-ton/master 
Add support to set satellites timeout
 2014-07-23 19:17:31 +03:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Jacob Vosmaer 285bb09b98 Move signup_enabled and signin_enabled back 
This partially reverts b5543be19d by restoring the nesting
for the signup_enabled and signin_enabled attributes.
 2014-07-21 17:10:28 +02:00
Dmitriy Zaporozhets a6546f51e2
Default gix max size to 20mb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 20:59:47 +03:00
Dmitriy Zaporozhets 3780444ccb
Increase grit memory limit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:27:54 +03:00
Sytse Sijbrandij e12a517e83 Improve the documentation of the signup item, password items is outdated now since people are used to the behaviour. 2014-07-01 16:20:07 +02:00
Sytse Sijbrandij b5543be19d Move standard login form to the auth settings where users expect them. 2014-07-01 14:49:40 +02:00
Dmitriy Zaporozhets 7be80fd899
Enable identicon for gravatar by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:27:50 +03:00
Dmitriy Zaporozhets 1355ede49d
Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Jeroen van Baarsen 65cf5957de Removed the Support Email setting 
This setting was not longer used in GitLab, so i think it can be
removed.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-05-30 20:11:07 +02:00
dosire 040b3be5b1 Give a hint where to find the email settings. 2014-05-26 16:15:12 +02:00
Marin Jankovski dbd88d453b Update the examples to example.com 2014-05-16 12:57:32 +02:00
Marin Jankovski 636ec6d3a0 Update warnings about relative url support. 2014-05-13 17:59:08 +02:00
Marin Jankovski d41fba4d37 Add warning to gitlab.yml related to gzip assets and relative links. 2014-05-13 17:08:59 +02:00
Dmitriy Zaporozhets 5dd4fb82e8 Merge pull request #6847 from Philzen/patch-2 
gitlab.yml description Typo
 2014-04-24 20:56:30 +03:00
Dmitriy Zaporozhets 7c1c03888c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2014-04-23 09:21:52 +00:00
Dmitriy Zaporozhets 3295a4db9d Merge branch 'email_in_gravatar_urls' into 'master' 
allow passing user's email address in custom Gravatar urls

Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and  gravatar.ssl_url in the config file like this:

```
gravatar:
    enabled: true
    plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}"
    ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}"
```

It's a only a 2 word patch.
 2014-04-23 08:52:15 +00:00
Philzen baec3f9bd7 # Fix description Typo 2014-04-23 08:57:54 +02:00
Dmitri Moore db86fe47ce Add ability to set different ssh host, if different from http/https 2014-04-18 20:20:43 -07:00
Dmitriy Zaporozhets 92b5e6b3bf Merge branch 'link-to-oauth-doc' into 'master' 
Link to oauth doc

Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
 2014-04-14 13:19:00 +00:00
Arnaud ABELARD 5d7bdf7642 allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example: 
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"

add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
 2014-04-12 23:10:45 +02:00
Robert Schilling e9409d1f4d Synchronize default issue closing pattern in documetation and implementation, fixes #6742 2014-04-11 23:13:21 +02:00
dosire db1be88f21 Link to the doc. 2014-04-10 14:39:58 +02:00
Drew Blessing 728b05cab7 Add OmniAuth Documentation 
Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Add OmniAuth Documentation

Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Use omniauth again

Remove notice

Restore whitespace

Slight changes
 2014-04-10 07:31:54 -05:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Jacob Vosmaer eeeaaa4bc1 Explain the default repository_downloads_path 2014-03-31 12:19:37 +02:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00