1d432e96bc
Add a link to libravatar doc in gitlab.yml.example.
2014-10-14 12:31:47 +02:00
3cd5abf635
Add config changes for mutliple LDAP support (EE only)
2014-10-13 13:56:54 +02:00
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
f7aba277e7
Add option to gitlab config to specify if LDAP server is active directory.
2014-09-30 12:07:31 +02:00
f778387e38
Add region to backup upload config in gitlab.yml
2014-09-30 12:05:07 +02:00
e1f6fa6f18
Add backup upload support to the rake task
2014-09-29 15:03:08 +02:00
532eff6169
Add more LDAP user_filter documentation
2014-09-24 14:02:24 +02:00
81a70bf515
Adding ability to configure webhook timeout via gitlab.yml
2014-09-12 11:38:14 -04:00
5d5d4ef91a
simplify HTTPS setup details
...
also adds comment about updating nginx files during upgrades
2014-09-07 15:31:13 -07:00
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
0a0cbe1274
make configuration comment spacing consistent
2014-08-22 17:20:31 -07:00
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
f82b9e48ec
Dont stub gitlab-shell calls. Make test environment closer to real one
2014-07-31 15:39:01 +03:00
e03ab14f78
Add a tip on how to test regular expressions
2014-07-25 18:26:04 +02:00
ed234e344e
Merge pull request #7316 from ayr-ton/master
...
Add support to set satellites timeout
2014-07-23 19:17:31 +03:00
07537faca7
Add support to set satellites timeout
2014-07-21 11:50:29 -04:00
285bb09b98
Move signup_enabled and signin_enabled back
...
This partially reverts b5543be19d
2014-07-21 17:10:28 +02:00
a6546f51e2
Default gix max size to 20mb
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 20:59:47 +03:00
3780444ccb
Increase grit memory limit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 15:27:54 +03:00
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
b5543be19d
Move standard login form to the auth settings where users expect them.
2014-07-01 14:49:40 +02:00
7be80fd899
Enable identicon for gravatar by default
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-17 09:27:50 +03:00
1355ede49d
Wipe wall notes feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:24:54 +03:00
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
040b3be5b1
Give a hint where to find the email settings.
2014-05-26 16:15:12 +02:00
dbd88d453b
Update the examples to example.com
2014-05-16 12:57:32 +02:00
636ec6d3a0
Update warnings about relative url support.
2014-05-13 17:59:08 +02:00
d41fba4d37
Add warning to gitlab.yml related to gzip assets and relative links.
2014-05-13 17:08:59 +02:00
5dd4fb82e8
Merge pull request #6847 from Philzen/patch-2
...
gitlab.yml description Typo
2014-04-24 20:56:30 +03:00
7c1c03888c
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
2014-04-23 09:21:52 +00:00
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
baec3f9bd7
# Fix description Typo
2014-04-23 08:57:54 +02:00
db86fe47ce
Add ability to set different ssh host, if different from http/https
2014-04-18 20:20:43 -07:00
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
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
e9409d1f4d
Synchronize default issue closing pattern in documetation and implementation, fixes #6742
2014-04-11 23:13:21 +02:00
db1be88f21
Link to the doc.
2014-04-10 14:39:58 +02:00
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
aea3712e8d
Add option for disable standard signin.
2014-04-07 17:11:06 +02:00
eeeaaa4bc1
Explain the default repository_downloads_path
2014-03-31 12:19:37 +02:00
200eeea258
Make the repository downloads path configurable
2014-03-31 12:19:37 +02:00
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
d36669d8ea
Merge pull request #6420 from Seklfreak/add-piwik-support
...
Added Piwik Integration
2014-02-26 18:19:25 +02:00
6ef3505b19
Add default settings to test env. Removed wrong comment for rack_profiler
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 12:44:29 +02:00
64e4b400d0
Added Piwik support
2014-02-23 15:13:38 +01:00
4fdafcaf8a
Merge pull request #5842 from vikraman/patch-1
...
Add comment about tls for ldap method
2014-01-29 10:24:59 -08:00
c62892b225
People keep adding http:// in front of the host.
2014-01-27 14:27:47 +01:00
4fc17cf13f
Reword the git explanation.
2014-01-27 13:01:20 +01:00
7ad70a56d3
Git over ssh and http are different things.
2014-01-22 17:51:00 +01:00
119c782e0b
More explanation for upload limits.
2014-01-22 17:01:47 +01:00
d4e82f5e11
Merge pull request #6094 from sinm/patch-1
...
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
2014-01-22 00:19:05 -08:00
1ee9442323
Further explain userPrincipalName settings
2014-01-21 13:33:29 +01:00
7fe7897c56
Explain how to use AD userPrincipalName for logins
2014-01-21 12:25:12 +01:00
433fca6c5b
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
...
… (misused double quotes here)
2014-01-20 07:47:19 +03:00
4d7792bc38
Merge branch 'explain_ldap_check' into 'master'
...
Improve the explanation of the LDAP check script
2014-01-17 14:14:05 +00:00
d435fbb9b2
Fix typo in LDAP explanation comment
2014-01-17 11:39:33 +01:00
390f0b76b5
Explain allow_username_or_email_login LDAP setting
2014-01-17 11:34:06 +01:00
af9a14c49c
Explain that `limit` only applies to the check
2014-01-16 18:40:45 +01:00
7d3363954e
Always ask for email with github omniauth
...
Fixes : #2061
Fix was proposed on twitter by: neic0, in the following tweet:
https://twitter.com/neic0/status/423138339806392320
2014-01-15 18:52:52 +01:00
2b090339d1
It's a bad idea to use hash symbol in a yaml value without quotes
2014-01-12 23:29:29 +03:00
969a4a8f71
Add comment about tls for ldap method
...
`omniauth-ldap` also supports tls for ldap method
2013-12-13 22:16:58 +05:30
f1c82bc56c
Add gitlab-shell#path option in config
...
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
/home/git/gitlab-shell
After this change you can place gitlab-shell in custom location.
Ex:
/Users/developer/gitlab/gitlab-shell
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 19:32:37 +02:00
906c65b624
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
...
Conflicts:
config/application.rb
config/gitlab.yml.example
config/unicorn.rb.example
2013-12-09 13:22:22 +00:00
23d180f5f1
Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq
2013-12-04 14:56:19 +00:00
80302a0f6f
Limit the number of results in gitlab:ldap:check
2013-12-03 18:51:21 +01:00
b8cb7df761
Add warning back.
2013-11-29 08:57:45 +01:00
47239aabef
Refer to rake gitlab:ldap:check script
2013-11-28 18:12:12 +01:00
22d3aa4e32
Unsupported is unclear.
2013-11-28 07:57:56 +01:00
d9bb4230cc
Adding authenticated public mode (internal).
...
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
2013-11-26 22:22:07 -06:00
a48e9ce999
Typo in gitlab.yml.example
2013-11-19 12:35:48 +01:00
963213b842
Fix link to auth wiki
2013-11-12 18:15:26 +01:00
a360ce73b2
Allow closes/closed & fixes/fixed for automatic regex closing
2013-11-08 07:51:29 -06:00
87fc35073a
Fixed comments for running gitlab in a non-root path
...
- If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server )
- If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
2013-11-06 10:14:48 +00:00
65f5d062e9
Use proper titles for issues trackers
2013-10-09 09:21:53 +02:00
c9dd2ca64b
Correct spelling mistake.
2013-10-02 08:23:27 +02:00
d66025f768
Also update example.
2013-10-01 11:43:53 +02:00
9ffabc6d7e
Merge pull request #5200 from pfaro/bugfix-signup
...
Add check if the signup setting is enabled. fixes #4832
2013-09-30 07:04:40 -07:00
e99701fbfa
Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path
2013-09-29 13:46:02 -04:00
96ae1a8099
Add check if the signup setting is enabled. fixes #4832
2013-09-27 11:56:30 +02:00
fcba0d55f4
Defaulted theme to MARS
...
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
2013-09-22 01:06:22 -04:00
51e6095dd1
Make users theme configurable
...
GITLAB-1262
Change-Id: I690cb8ea294df53ebe8405a519c23c501af2c21a
Conflicts:
app/models/user.rb
config/initializers/1_settings.rb
spec/models/user_spec.rb
2013-09-22 01:05:14 -04:00
8bbb5628c4
Don't quote the default issue closing regex.
...
It turns out that regex escapes and YAML quoted-scalar escapes don't play
nicely together.
2013-09-15 15:46:32 -04:00
f87e2d2801
make public/private setting for project creation configurable
2013-09-09 14:10:58 -04:00
c8a115c0e3
Link issues from comments and automatically close them
...
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
2013-08-25 18:58:41 -04:00
fd1661468f
Remove can_create_team code from user
2013-08-21 12:31:47 +03:00
63009af117
Relative root needs to be changed in three places.
2013-08-19 22:20:32 +02:00
6ec73fc9a6
Configure the relative path only one time.
2013-08-19 21:49:27 +02:00
39d8a64d25
Fixes grack authentification under relative_url_root
...
Ref: e6159b8725https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228
Add Rails' variable in application.rb to support relative url
This variable is used by assets compilation and other modules.
Note that user needs to change application.rb too
Restrict session cookie to the relative path if set.
Ref: 2c2f1e3185161afda3fa
2013-08-15 21:25:09 +02:00
089605fe6b
Allow the ldap logins with email or username
...
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
2013-07-18 09:33:12 -04:00
7588186e81
Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq
2013-07-02 08:43:40 +00:00
9e86f3b156
Warn that relative URL's are unsupported
2013-07-02 10:27:51 +02:00
01d694aaba
whitespaces in gitlab.yml.example
2013-06-25 14:01:41 +03:00
5ec3129ea6
Changed regex to support Jira issue numbering format
...
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123 .
Added Jira Issue tracker configuration example
2013-05-27 16:51:37 -03:00
ec1055076c
Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
...
Conflicts:
config/gitlab.yml.example
2013-05-27 15:17:06 +03:00
a3645b5b4d
Restyle login page for LDAP/regular login
2013-05-24 19:43:47 +03:00
22279bc558
Add settings for user permission defaults
...
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
2013-05-16 18:02:22 +04:00
aee110e20d
Add extra config for some advanced customization
2013-05-08 21:03:14 +03:00
f64874c1f5
Fixed forgotten unicorn to puma in a comment.
2013-05-06 16:52:47 +02:00
f5b549af25
Wall and snippets were disabled by default
2013-04-26 12:02:00 +04:00
d51618b9a1
New settings added to enable or disable project features by default
...
Conflicts:
config/gitlab.yml.example
config/initializers/1_settings.rb
2013-04-24 15:57:08 +04:00
Marin Jankovski
Jan-Willem van der Meer
Dmitriy Zaporozhets
Jacob Vosmaer
Wes Gurney
Ben Bodenmiller
Dmitriy Zaporozhets
Ayrton Araújo
Sytse Sijbrandij
Jeroen van Baarsen
Marin Jankovski
Philzen
Dmitri Moore
Arnaud ABELARD
Robert Schilling
Drew Blessing
Sebastian Winkler
sinm
Vikraman Choudhury
Crom (Thibaut CHARLES)
Sytse Sijbrandij
Jason Hollingsworth
Julien Kirch
Connor Tumbleson
Stefano Tortarolo
Thomas Misilo
Perry Faro
Izaak Alpert
Ash Wilson
Angus MacArthur
amouhzi
Jean-Luc Geering
Pedro Guridi
Dmitry Medvinsky
Dennis Boldt
Andrew8xx8