Commit Graph
369 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Sytse Sijbrandij 5c2c5db7b7 Also match if it is at the end or in the middle of a sentence. 2013-10-01 10:53:44 +02:00
Marin Jankovski 055b60d420 Add documentation to help section, rack_attack as example 2013-09-30 11:10:46 +02:00
Marin Jankovski c562d290ea Enable rack attack and add a throttle. 2013-09-25 19:07:14 +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
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
amouhziandHassan Amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
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: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)
2013-08-15 21:25:09 +02:00
Sytse Sijbrandij 994fe9fd31 Fix for Resque forking might cause stuck workers for the threaded Sidekiq. 2013-08-10 16:20:33 +02:00
Izaak Alpert d04f32866f Default allow username or email login to false
-If not specified in the gitlab.yml default this setting to false

Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
2013-07-18 09:33:12 -04:00
Izaak Alpert 1a31cb2c37 Update the proc/lamda to be consistent
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
2013-07-18 09:33:12 -04: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 5511a731bc Enable threadsafe. Preload lib/ 2013-06-11 18:03:13 +03:00
Daniel Salmerón AmselemandDmitriy Zaporozhets 64c37a21c8 Fix typo in smtp_settings.rb.sample 2013-06-07 16:59:53 +03:00
Dmitriy Zaporozhets c698bc7d9e Merge pull request #4037 from mitchty/master
Remove user directory path assumptions
2013-05-29 23:28:17 -07: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
Mitch Tishmack 719f72315f Apparently the gitlab Travis install has no git user.
Hackily handle this with a begin block and return a default that matches current use.
2013-05-23 12:52:38 -05:00
ash e444c7f6ba Generate the Rails secret token on first run.
Store the secret token in a .gitignored file called ".secret", which is
created by the initializer if it doesn't exist.
2013-05-22 23:55:48 +00:00
Mitch Tishmack 2c947647be Add a new Settings.gitlab value "user_home".
Instead of assuming that the Settings.gitlab['user'] home directory is:
/home/git

Obtain the default value from Etc and use that if not set in config.yml.
2013-05-22 13:51:08 -05: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 9e0246684d Files controller handle redirect to remote storage. Added config block to carrierwave init 2013-05-15 22:35:59 +03:00
Dmitriy Zaporozhets 9a94f5eb73 Enable HAML ugly mode by default for all environments 2013-05-14 22:17:46 +03:00
Dmitriy Zaporozhets 6d204544a1 Merge pull request #3687 from hiroponz/fix-not-using-git-bin-path
Fix not using git.bin_path in config.
2013-05-08 11:17:48 -07:00
Dmitriy Zaporozhets aee110e20d Add extra config for some advanced customization 2013-05-08 21:03:14 +03:00
Sato Hiroyuki 9214962d24 Fix not using git.bin_path in config.
Closing #3614" and "Closing #3574.
2013-05-07 17:20:36 +09:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
Dmitriy Zaporozhets 493b5ff011 Add smtp_settings sample 2013-05-05 12:48:32 +03:00
Dmitriy Zaporozhets 23ee8e6257 Init aws support for file storage 2013-05-01 12:41:37 +03:00
Dmitriy Zaporozhets ca281483b3 Update gitlab_git to 1.0.3 2013-04-28 21:27:49 +03:00
Dmitriy Zaporozhets 4f2d2c90f7 Move Gitlab::Git out of gitlab core 2013-04-27 23:50:17 +03: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
Dmitriy Zaporozhets 9d92433a7c login with both email or username 2013-03-25 16:10:14 +02:00
Dmitriy Zaporozhets 0103363191 replace Gitolited mixin with Gitlab::ShellAdapter 2013-03-21 21:01:14 +02:00
Pierre GUINOISEAU 67a61c80d1 Allow connection to Redis via unix socket
Allow connection to Redis via unix socket, using
unix:/var/run/redis/redis.sock for example.

Default behaviour does not change, except that the full Redis URL must
be configured, with redis:// for tcp or unix: for unix socket.
2013-03-06 22:06:12 +01:00
Dmitriy Zaporozhets d5663e148f Merge pull request #2870 from mikew/relative-url-root-default
default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
2013-03-05 06:54:31 -08:00
Dmitriy Zaporozhets ed9543ff5d update devise gem 2013-02-28 21:06:16 +02:00
Andrew8xx8 c643b50dbd Default value for issues_tracker setting added 2013-02-28 16:11:13 +04:00
Dmitriy Zaporozhets e049e18780 Merge pull request #2991 from raphendyr/username_change_disablation
Add option to disable username changing
2013-02-18 09:59:24 -08:00
Dmitriy Zaporozhets b729728536 uppercase Gitlab version and revision constants. check api return gitlab version now 2013-02-16 14:42:22 +02:00
Jaakko Kantojärvi ba65f2910b Add option to disable username changing
This option allows to disable users from changing their username.

This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.

You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Andrew8xx8 77a3bfe1de Environments support added to Gitlab config 2013-02-14 11:44:34 +04:00
Dmitriy Zaporozhets d64090b8a9 No gitolite in project any more 2013-02-11 19:16:59 +02:00
Dmitriy Zaporozhets cdcf69d0d9 gitlab;shell init script 2013-02-07 10:06:39 +02:00
Dmitriy Zaporozhets 27d9ac0fe8 Make gitlab works with gitlab-shell 2013-02-04 15:07:56 +02:00
Mike Wyatt 7225c06934 default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT'] 2013-01-31 18:28:03 -03:30
Dmitriy Zaporozhets cd8a302997 Fix application crash on help page 2013-01-20 14:17:56 +02:00
Riyad Preukschas 47e510e14f Small fixes 2013-01-19 15:26:55 +01:00