Jacob Vosmaer
05b518aa4d
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
2015-07-29 15:44:04 +02:00
Jacob Vosmaer
d371331a65
Remove weird trailing characters
2015-07-24 18:55:50 +02:00
Jacob Vosmaer
39a7e210a3
Use a separate backup test directory and nuke its contents
2015-07-24 18:54:06 +02:00
Douwe Maan
70a3c165a9
Allow custom label to be set for authentication providers.
2015-07-23 15:20:12 +02:00
Jacob Vosmaer
bb50b7fcd0
Allow custom backup archive permissions
...
This change helps system administrators who want to replicate
GitLab backup files without needing root permissions.
2015-07-06 18:43:17 +02:00
Robert Speicher
5f20574db5
Fix a few remaining references to the old Theme names/IDs
2015-06-13 17:58:17 -04:00
Marin Jankovski
df346e9507
Add a note that changing example configuration files requires changing omnibus-gitlab.
2015-06-11 15:11:37 +02:00
Jeroen Nijhof
cd522f3309
remove extra space
2015-06-09 17:59:08 +02:00
Jeroen Nijhof
bf7315cb13
update fog to 1.25.0 and add multipart upload support
2015-06-09 17:56:37 +02:00
Alex Lossent
dfcea8ed51
Add option to automatically link omniauth and LDAP identities
...
Until now, a user needed to first sign in with his LDAP identity and then manually
link his/her account with an omniauth identity from their profile.
Only when this is done can the user authenticate with the omniauth provider and at
the same time benefit from the LDAP integration (HTTPS authentication with LDAP
username/password and in EE: LDAP groups, SSH keys etc.).
This feature automates the process by looking up a corresponding LDAP person when a
user connects with omniauth for the first time and then automatically linking the LDAP
and omniauth identities (of course, like the existing allow_single_sign_on setting,
this is meant to be used with trusted omniauth providers).
The result is identical to a manual account link.
Add config initializers for other omniauth settings.
2015-06-03 11:46:20 +02:00
Alex Lossent
5491f6fbde
Add an option to automatically sign-in with an Omniauth provider without showing the GitLab sign-in page
...
This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for
all user authentication.
2015-05-29 18:15:03 +02:00
Alex Lossent
22de5443c5
Add SAML support via Omniauth
2015-05-27 16:38:10 +02:00
Jakub Jirutka
ed3298fc01
Allow to configure gitlab_shell_secret location
2015-05-16 21:46:06 +02:00
Dmitriy Zaporozhets
317ed1fa90
Revert "Allow to configure smtp and sendmail in gitlab.yml"
2015-05-06 17:39:18 +03:00
Jakub Jirutka
b4be7aed77
Allow to configure smtp and sendmail in gitlab.yml
2015-05-06 13:15:33 +02:00
Stan Hu
dc2b380da6
Fix config template from parse errors
2015-05-03 08:58:52 -07:00
Achilleas Pipinellis
62aa05dd0c
Merge branch 'master' into 'master'
...
Update config.yml.example
See merge request !597
2015-05-03 12:05:19 +00:00
win32
fc79f7382c
Update config.yml.example
2015-05-02 11:04:07 +00:00
Vinnie Okada
bd557e4b64
Add new admin settings
...
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Douwe Maan
55d086ba08
Clarify config var and add to LDAP docs.
2015-04-14 18:17:46 +02:00
Douwe Maan
238e4f0295
Add config var to block auto-created LDAP users.
2015-04-14 17:09:05 +02:00
Jacob Vosmaer
f39b150a02
Call your existing LDAP server 'main'
...
By imposing this rule we avoid having to demand that 'ldapmain' exists
in the settings initializer.
2015-04-13 15:45:19 +02:00
Stan Hu
81a5a9713d
Add ability to configure Reply-To address in gitlab.yml
...
Closes #1305
2015-04-03 06:47:54 -07:00
Achilleas Pipinellis
7a02b5c20c
Missing dot.
2015-03-30 23:55:12 +03:00
Achilleas Pipinellis
64cd7ebf39
Update documentation on issue closing pattern.
2015-03-30 22:31:07 +03:00
Marin Jankovski
bfc36fff11
We've moved external trackers to service, remove from gitlab.yml.
2015-03-27 09:25:35 -07:00
Marin Jankovski
b322344520
Add a note about not adding new setting options to gitlab.yml.
2015-03-26 18:07:20 -07:00
Stan Hu
56d87db32c
Reduce Rack Attack false positives by clearing out auth failure count upon
...
successful Git over HTTP authentication.
Add logging when a ban goes into effect for debugging.
Issue #1171
2015-03-24 00:36:46 -07:00
Vinnie Okada
ad0ca0499a
Merge branch 'master' into fix-restricted-visibility
...
Conflicts:
db/schema.rb
2015-03-14 10:49:11 -06:00
Vyacheslav Slinko
61ed518781
Make email display name configurable
2015-03-11 11:04:23 +07:00
Vinnie Okada
cacac147de
Move restricted visibility settings to the UI
...
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
2015-03-07 13:11:08 -07:00
Douwe Maan
ad6d623234
Add Bitbucket importer.
2015-02-24 15:07:24 +01:00
Dmitriy Zaporozhets
3d369a5b85
Remove settings from gitlab.yml.example which we already have in UI
2015-02-10 09:30:39 -08:00
Dmitriy Zaporozhets
49d6721329
Add gitlab to oauth providers
2015-02-07 13:49:05 -08:00
Jacob Vosmaer
087c4cbc3c
Make 'plain', port 389 the default for LDAP
2015-01-28 11:34:33 +01:00
Dmitriy Zaporozhets
d005c44816
Mix wrong comment about signup
2015-01-22 10:38:24 -08:00
jubianchi
b21a2d821a
Allow commit messages to close several issues at once (thanks @123Haynes
...
for his work and help)
2015-01-20 10:45:48 +01:00
Drew Blessing
a3ef61de92
Merge pull request #8040 from drag00n/updatedhint
...
Use full path from root of project.
2015-01-18 22:02:46 -06:00
drag00n
b97218db4d
Use full path from root of project.
...
Remove markdown syntax from config file
2015-01-18 21:34:35 -05:00
Jacob Vosmaer
af56c1dd32
White-list requests from 127.0.0.1
...
On some misconfigured GitLab servers, if you look in production.log it looks
like all requests come from 127.0.0.1. To avoid unwanted banning we
white-list 127.0.0.1 with this commit.
2015-01-06 16:56:56 +01:00
Jacob Vosmaer
62ea02740d
Block Git HTTP Basic Auth after 10 failed attempts
2014-12-15 18:57:42 +01:00
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