Commit Graph
92 Commits
Author SHA1 Message Date
Douwe Maan fd21d72b1b Extend issue closing pattern. 2015-02-08 13:56:12 +01:00
Dmitriy Zaporozhets 028b58a987 Merge pull request #8449 from choppsv1/ipv6_addr_fix
Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git")
2015-02-04 14:51:06 -08:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Marco Wessel aad6ceaef9 Allow configuring protection of the default branch upon first push 2015-01-25 17:09:10 +01: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
Dmitriy Zaporozhets 5e04977582 Fix signup settings 2015-01-16 08:49:07 -08:00
Jacob Vosmaer 3c5c1a7802 Enable signup by default 2015-01-14 17:42:44 +01: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
Christian E. Hopps 0ed4ae7295 Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") 2014-12-15 07:02:07 -05: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
Jan-Willem van der Meer 61d9d4e2eb Default the LDAP server label to LDAP 2014-10-17 18:08:26 +02:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer e1cf9c15eb Apply configuration changes for Multiple LDAP servers 2014-10-13 14:04:10 +02:00
Marin Jankovski f7aba277e7 Add option to gitlab config to specify if LDAP server is active directory. 2014-09-30 12:07:31 +02:00
Jacob Vosmaer e1f6fa6f18 Add backup upload support to the rake task 2014-09-29 15:03:08 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Jacob Vosmaer ec381a9308 Use new git max_size in the settings initializer 2014-08-15 11:38:32 +02:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Dmitriy Zaporozhets 76dca50abe Fix password change. Fix test settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 23:40:08 +03:00
Dmitriy Zaporozhets 7be80fd899 Enable identicon for gravatar by default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-17 09:27:50 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:24:54 +03:00
Jeroen van Baarsen 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
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 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
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 4691285989 Allow to overwrite location of gitlab.yml config file. 2014-04-15 19:23:55 +01: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
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
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
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
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
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
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
Dmitriy Zaporozhets c698bc7d9e Merge pull request #4037 from mitchty/master
Remove user directory path assumptions
2013-05-29 23:28:17 -07: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
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 aee110e20d Add extra config for some advanced customization 2013-05-08 21:03:14 +03:00
Andrew8xx8 f5b549af25 Wall and snippets were disabled by default 2013-04-26 12:02:00 +04:00