Commit Graph
369 Commits
Author SHA1 Message Date
Jacob Vosmaer 7dfb678df9 Revert "Actually use the 'user_filter' configuration option"
This reverts commit e9d4587ff1, which is
incompatible with GitLab's built in LDAP user filter: a GitLab LDAP
filter is [added on top of the other filters used to find the
user](https://gitlab.com/gitlab-org/gitlab-ce/blob/982d4d51e8110bec280eb00db0fb756b062103d9/lib/gitlab/ldap/adapter.rb#L61)

Example GitLab LDAP filter: `(memberOf=cn=foo,dc=bar)`.

In contrast, an omniauth-ldap filter [replaces the 'normal'
filters](https://gitlab.com/gitlab-org/omniauth-ldap/blob/76d77543dec0c585bb4e974262f43675f9810953/lib/omniauth/strategies/ldap.rb#L55)

Example omniauth-ldap user filter:
`(&(uid=%{username})(memberOf=cn=foo,dc=bar))`.
2014-05-27 15:53:04 +02:00
Marin Jankovski fe1ca61601 Make sure that tests pass when aws group is used. 2014-04-24 13:23:17 +02:00
Dmitriy Zaporozhets e54b457ea3 Improve ssh_host settings 2014-04-23 16:22:49 +02:00
Dmitriy Zaporozhets 2134e18ec6 Fix default ssh_host setting 2014-04-23 16:19:59 +02: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 3bb8c17cc3 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2014-04-23 09:09:45 +00:00
Dmitriy Zaporozhets 972e40cc47 Merge branch 'bug-to-ldap-configuration' into 'master'
LDAP Configuration Fix

This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
2014-04-23 08:49:09 +00:00
Dmitriy Zaporozhets e680911767 Merge pull request #6827 from demisx/master
Add ability to set different ssh host, if different from http/https
2014-04-23 10:04:08 +03:00
Dmitriy Zaporozhets 7fab63b41f Merge branch 'namespace_redis_cache' into 'master'
Give the Rails cache its own Redis namespace
2014-04-23 07:00:01 +00:00
Sytse Sijbrandij 7e10d01342 Merge pull request #6782 from pkgr/allow-to-change-gitlab-config-location-via-env-variable
Allow to overwrite location of gitlab.yml config file.
2014-04-22 13:52:00 +02:00
Travis Odom e9d4587ff1 Actually use the 'user_filter' configuration option 2014-04-21 15:48:42 +00:00
Dmitri Moore db86fe47ce Add ability to set different ssh host, if different from http/https 2014-04-18 20:20:43 -07:00
Cyril Rohr b29171d9ec Allow to specify secret token via environment variable. 2014-04-15 19:27:25 +01:00
Cyril Rohr 4691285989 Allow to overwrite location of gitlab.yml config file. 2014-04-15 19:23:55 +01:00
Jacob Vosmaer 8d78662e69 Give the Rails cache its own Redis namespace
Before this change, Rails cache data was stored in a global Redis
namespace. As a consequence, clearing the Rails cache (`rake
cache:clear`) would also delete all Sidekiq queue data and session
storage. This change puts all Rails cache data in a `cache:gitlab`
namespace, making `rake cache:clear` safe again.
2014-04-15 15:53:14 +02:00
Robert Schilling e9409d1f4d Synchronize default issue closing pattern in documetation and implementation, fixes #6742 2014-04-11 23:13:21 +02:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 93cdf8a312 Enable SQL queries in mini-profiler
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 11:50:02 +02:00
Pierre de La Morinerie 96dded3ec8 Send emails from the author
This changes the email "From" field from "gitlab@example.com" to either:

* "John Doe <gitlab@example.com>" if the author of the action is known,
* "GitLab <gitlab@example.com>" otherwise.

Rationale: this allow mails to appear as if they were sent by the
author. It appears in the mailbox more like a real discussion between
the sender and the receiver ("John sent: we should refactor this") and
less like a robot notifying about something.
2014-02-19 18:25:18 +01:00
Athos Ribeiro 84408015cd Change Devise.confirm_within to Devise.allow_unconfirmed_access_for
According to Devise's changelog
(https://github.com/plataformatec/devise/blob/master/CHANGELOG.md),
Devise.confirm_within was deprecated in favor of
Devise.allow_unconfirmed_access_for in version 2.0.0.
2014-02-03 21:20:36 -05:00
Dmitriy Zaporozhets 5db3468d7e Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecret
refactor omniauth configuration method
2014-02-01 05:36:25 -08:00
Dmitriy Zaporozhets c75ab4ec9a Remove python from installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-30 19:48:47 +02:00
Jason Hollingsworth 39a2adf4f4 Fix broken test in spec/models/project_spec.rb
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
2014-01-24 21:14:05 -06:00
Raffael Schmid 7863319b97 Merge branch 'master' into dont-depend-on-appid-and-appsecret
* master: (238 commits)
  Version 6.5.1
  Fix selectbox when submit MR from fork to origin
  Fix HELP layout
  No need for code tag here.
  Spelling mistake and add links.
  Warn against RVM.
  Remove GitHub mention because we also have a GitLab issue tracker now.
  Replace 6.0-to-6.4.md with 6.0-to-6.5.md
  Add public assets to gitignore
  Version 6.5.0
  Use 6-5 branch in installation docs
  Remove deprecated twitter handle.
  Further explain userPrincipalName settings
  Update from 6.4 to 6.5 guide
  Explain how to use AD userPrincipalName for logins
  More entries to CHANGELOG. Version to rc1
  Rephrase LDAP check script output
  add O'Reilly sponsorship in CHANGELOG
  Fix select2 css for drop above style
  Rename "Website url" labels to "Website"
  ...
2014-01-23 10:55:26 +01:00
Jacob Vosmaer 0db36897e6 Add instructions for custom password length limits 2014-01-13 10:41:10 +01:00
Raffael Schmid 568d1c27c5 refactor omniauth configuration method
This refactoring allows a user to use omniauth providers which do not
use ```app_id``` and ```app_secret``` without needing to change the
devise configuration.
2013-12-30 13:26:35 +01:00
Marin Jankovski c447a2131d Enable secure option if https is used. 2013-12-25 12:30:33 +01:00
Marin Jankovski f537e4c963 Confirmation url throttle. 2013-12-24 10:11:33 +01:00
Jacob Vosmaer 7cb75aeb46 Reduce Fog expiration period to 17 years 2013-12-11 17:40:11 +01:00
Jacob Vosmaer 3e57d88e57 Expire fog links after 34 years 2013-12-11 17:40:11 +01:00
Dmitriy Zaporozhets ac5842d970 Migrate application to rails 4 step 1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 12:11:26 +02: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
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Dmitriy Zaporozhets 596e64e5d7 Drop rjs from Notes#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-29 14:46:40 +02: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
Dmitriy Zaporozhets 47e8c67d1d Include API session route under rack protection
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:24:45 +02:00
Dmitriy Zaporozhets 0461760f21 Minimal password length increased
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 18:11:03 +02:00
Marin Jankovski bb71c5d89f No limits when testing. 2013-11-21 16:04:23 +01:00
Marin Jankovski 3c8c06751c Enable rack_attack by default. 2013-11-06 13:10:59 +01:00
vollnhalsandLion Vollnhals 67c18aa941 Respect the configured redis URL when initializing the session store
It was not possible to start Gitlab with a redis server running on another host or port. Every other subsystem that uses redis respects the settings in config/resque.yml.

This patch uses the configured url from the cache_store configuration.
The cache_store configuration already loads the correct redis url from config/resque.yml.

Closes #5406
2013-10-30 17:11:56 +01:00
Edouard 4dbce77615 Fix typo in sample smtp settings 2013-10-22 17:38:11 +02:00
Marin Jankovski 728f0c2005 Add smtp settings override in smtp_settings sample file. 2013-10-18 09:49:55 +02:00
Dmitriy Zaporozhets 6fff92e984 Enable confirmable and reconfirmable modules for User
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address

Conflicts:
	app/models/user.rb
2013-10-15 09:56:04 +03:00
Sytse Sijbrandij ba7c1764be The cookie store is vulnerable to session replay attacks. 2013-10-11 17:54:46 +02:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Dmitriy Zaporozhets c44c5f5faa Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq 2013-10-02 14:14:49 +00:00