Commit Graph

105 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 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
Jacob Vosmaer 1ee9442323 Further explain userPrincipalName settings 2014-01-21 13:33:29 +01:00
Jacob Vosmaer 7fe7897c56 Explain how to use AD userPrincipalName for logins 2014-01-21 12:25:12 +01:00
sinm 433fca6c5b Updated gitlab.yaml.example's issue_closing_pattern to single quotes
… (misused double quotes here)
2014-01-20 07:47:19 +03:00
Dmitriy Zaporozhets 4d7792bc38 Merge branch 'explain_ldap_check' into 'master'
Improve the explanation of the LDAP check script
2014-01-17 14:14:05 +00:00
Jacob Vosmaer d435fbb9b2 Fix typo in LDAP explanation comment 2014-01-17 11:39:33 +01:00
Jacob Vosmaer 390f0b76b5 Explain allow_username_or_email_login LDAP setting 2014-01-17 11:34:06 +01:00
Jacob Vosmaer af9a14c49c Explain that `limit` only applies to the check 2014-01-16 18:40:45 +01:00
Jeroen van Baarsen 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
sinm 2b090339d1 It's a bad idea to use hash symbol in a yaml value without quotes 2014-01-12 23:29:29 +03:00
Dmitriy Zaporozhets 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
Crom (Thibaut CHARLES) 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
Dmitriy Zaporozhets 23d180f5f1 Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq 2013-12-04 14:56:19 +00:00
Jacob Vosmaer 80302a0f6f Limit the number of results in gitlab:ldap:check 2013-12-03 18:51:21 +01:00
Sytse Sijbrandij b8cb7df761 Add warning back. 2013-11-29 08:57:45 +01:00
Jacob Vosmaer 47239aabef Refer to rake gitlab:ldap:check script 2013-11-28 18:12:12 +01:00
Sytse Sijbrandij 22d3aa4e32 Unsupported is unclear. 2013-11-28 07:57:56 +01:00
Jason Hollingsworth 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
Julien Kirch a48e9ce999 Typo in gitlab.yml.example 2013-11-19 12:35:48 +01:00
Julien Kirch 963213b842 Fix link to auth wiki 2013-11-12 18:15:26 +01:00
Connor Tumbleson a360ce73b2 Allow closes/closed & fixes/fixed for automatic regex closing 2013-11-08 07:51:29 -06:00
Crom (Thibaut CHARLES) 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
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Sytse Sijbrandij c9dd2ca64b Correct spelling mistake. 2013-10-02 08:23:27 +02:00
Sytse Sijbrandij d66025f768 Also update example. 2013-10-01 11:43:53 +02:00
Dmitriy Zaporozhets 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
Thomas Misilo 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
Perry Faro 96ae1a8099 Add check if the signup setting is enabled. fixes #4832 2013-09-27 11:56:30 +02:00
Izaak Alpert fcba0d55f4 Defaulted theme to MARS
Change-Id: I02814fb47edcc915309183547cc8dcb165100f4f
2013-09-22 01:06:22 -04:00
Izaak Alpert 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
Ash Wilson 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
Angus MacArthur f87e2d2801 make public/private setting for project creation configurable 2013-09-09 14:10:58 -04:00
ash wilson 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
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Sytse Sijbrandij 63009af117 Relative root needs to be changed in three places. 2013-08-19 22:20:32 +02:00
Sytse Sijbrandij 6ec73fc9a6 Configure the relative path only one time. 2013-08-19 21:49:27 +02:00
amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root
Ref: e6159b8725
Ref: https://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: 2c2f1e3185

Fix Update attachment_uploader.rb bug with relative URL

See: 161afda3fa

Fix Wall relative bug with attachement files (javascript)
2013-08-15 21:25:09 +02:00
Izaak Alpert 089605fe6b Allow the ldap logins with email or username
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
2013-07-18 09:33:12 -04:00
Dmitriy Zaporozhets 7588186e81 Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq 2013-07-02 08:43:40 +00:00
Jacob Vosmaer 9e86f3b156 Warn that relative URL's are unsupported 2013-07-02 10:27:51 +02:00
Jean-Luc Geering 01d694aaba whitespaces in gitlab.yml.example 2013-06-25 14:01:41 +03:00
Pedro Guridi 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
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets a3645b5b4d Restyle login page for LDAP/regular login 2013-05-24 19:43:47 +03:00
Dmitry Medvinsky 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
Dmitriy Zaporozhets aee110e20d Add extra config for some advanced customization 2013-05-08 21:03:14 +03:00
Dennis Boldt f64874c1f5 Fixed forgotten unicorn to puma in a comment. 2013-05-06 16:52:47 +02:00
Andrew8xx8 f5b549af25 Wall and snippets were disabled by default 2013-04-26 12:02:00 +04:00
Andrew8xx8 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
Axilleas Pipinellis f95f1bb338 Fixed typo s/insues/issues 2013-04-15 19:36:00 +03:00