Douwe Maan
61ceb45088
Fix.
2015-05-15 15:32:49 +02:00
Douwe Maan
ba07c9f7f5
Improve fix.
2015-05-15 14:56:04 +02:00
Douwe Maan
b77e1ae6f7
Don't require DB conncetion in AttrEncrypted.
2015-05-15 14:34:22 +02:00
Dmitriy Zaporozhets
c2ee828c19
Merge branch 'omniauth-csrf' into 'master'
...
Protect OmniAuth request phase against CSRF.
Addresses #2268 .
See merge request !1793
2015-05-14 14:22:26 +00:00
Dmitriy Zaporozhets and Robert Speicher
802fcd051f
Add support for backup codes
2015-05-09 17:31:37 -04:00
Dmitriy Zaporozhets and Robert Speicher
50a2a229e7
Fix rubocop complain
2015-05-09 17:31:10 -04:00
Dmitriy Zaporozhets and Robert Speicher
7302395142
Init 2 factor authentication for user model
2015-05-09 17:31:07 -04:00
Dmitriy Zaporozhets
6c32abc5f7
Merge branch 'rs-task_list' into 'master'
...
Use task_list gem for task lists
Task Lists can now be used in comments, and they'll render in previews. 👏
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271
See merge request !599
2015-05-08 09:39:48 +00:00
Robert Speicher
b519e2312f
Disable Rack::MiniProfiler for Jasmine's specs route
2015-05-06 15:13:17 -04:00
Dmitriy Zaporozhets
317ed1fa90
Revert "Allow to configure smtp and sendmail in gitlab.yml"
2015-05-06 17:39:18 +03:00
Jakub Jirutka
b4be7aed77
Allow to configure smtp and sendmail in gitlab.yml
2015-05-06 13:15:33 +02:00
Dmitriy Zaporozhets
0df317f729
Merge branch 'restrict-signups-to-domains' into 'master'
...
Add application setting to restrict user signups to e-mail domains
This feature was requested long ago:
http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and prone to mistakes.
Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain.
Screenshots:
See merge request !598
2015-05-03 10:02:45 +00:00
Stan Hu
eb4f1eb5f5
Add application setting to restrict user signups to e-mail domains
...
This feature was requested long ago:
http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.
Only restrict e-mail addresses upon creation
2015-05-02 09:36:52 -07:00
Stan Hu
4dda17a5bf
Make Reply-To config apply to change e-mail confirmation and other notifications
...
sent through Devise
Fix test case that was passing due to a broken `around` statement.
Closes #1556
2015-05-01 22:57:10 -07:00
Robert Speicher
2c90579749
Set default_url_options in test environments too
2015-04-25 19:46:05 -04:00
Douwe Maan
571ba5a7fe
Protect OmniAuth request phase against CSRF.
2015-04-24 17:03:18 +02:00
Robert Speicher
b71e5a17e9
Add default_url_options initializer
...
Fixes #2266
2015-04-23 12:58:11 -04:00
Robert Speicher
6c3591279f
Fix two places where we should be using Rails.env.development?
2015-04-20 18:28:19 -04:00
Marin Jankovski
225b43de22
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-04-20 09:43:28 +02:00
Roshan Gautam
984f8077b3
Fix Resource Owner Password Authentication Flow
2015-04-17 11:47:02 -05:00
Robert Speicher
1e27b68b36
Add Markdown to Mime types
2015-04-15 12:25:24 -04:00
Robert Speicher
ef47ea3d39
Revert "Fix and improve help rendering"
...
This reverts commit d365004e68
2015-04-15 12:24:44 -04:00
Douwe Maan
238e4f0295
Add config var to block auto-created LDAP users.
2015-04-14 17:09:05 +02:00
Dmitriy Zaporozhets
4ab717ea6a
Merge branch 'ldap_migration'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
db/schema.rb
2015-04-13 17:18:02 +03:00
Jacob Vosmaer
f39b150a02
Call your existing LDAP server 'main'
...
By imposing this rule we avoid having to demand that 'ldapmain' exists
in the settings initializer.
2015-04-13 15:45:19 +02:00
Dmitriy Zaporozhets
7f04a4174e
Merge branch 'shell-version-warning' into 'master'
...
Warn when gitlab-shell version doesn't match requirement.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791 .
See merge request !495
2015-04-13 13:05:47 +00:00
Jacob Vosmaer
ec7a68a1a5
Simplify legacy LDAP config interpretation
2015-04-13 11:50:44 +02:00
Valery Sizov
8666f497ff
fix ldap identities
2015-04-11 17:56:45 +03:00
Douwe Maan
0ece6bd828
Use \A and \z in regexes instead of ^ and $.
2015-04-10 18:31:07 +02:00
Robert Speicher
91c39fd8c7
Add lib/gitlab.rb to autoload non-conventional paths
2015-04-09 14:19:25 -04:00
Robert Speicher
a3601d6005
Revert "Preload lib/"
...
This reverts commit 5511a731bc
2015-04-09 12:21:59 -04:00
Douwe Maan
f915a4b80f
Warn when gitlab-shell version doesn't match requirement.
2015-04-06 14:02:49 +02:00
Douwe Maan
45ca39e81b
Merge remote-tracking branch 'github.com/master'
2015-04-04 14:23:32 +02:00
Douwe Maan
bc2edc359d
Remove sidekiq-limit_fetch because it require Redis 2.6.
2015-04-03 18:38:31 +02:00
Douwe Maan
04a42ce3f1
Merge branch 'custom-email-reply-to' into 'master'
...
Add ability to configure Reply-To address
### What does this MR do?
This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com `.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/ )?
#1305
See merge request !455
2015-04-03 15:14:04 +00:00
Stan Hu
81a5a9713d
Add ability to configure Reply-To address in gitlab.yml
...
Closes #1305
2015-04-03 06:47:54 -07:00
Sullivan SENECHAL and Sullivan SENECHAL
d365004e68
Fix and improve help rendering
2015-04-03 11:56:50 +02:00
Douwe Maan
317206300d
Merge branch 'configurable-attachment-size' into 'master'
...
Support configurable attachment size in Application Settings page
### What does this MR do?
This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page.
### Are there points in the code the reviewer needs to double check?
What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid.
### Why was this MR needed?
We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/ )?
See Issue #1258
### Screenshots
Before:
After:
See merge request !407
2015-04-03 08:47:55 +00:00
Stan Hu
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
Douwe Maan
e7bbd85b34
Limit number of concurrent archive_repo jobs to 2.
2015-03-31 12:52:20 +02:00
Nihad Abbasov
be65373fc7
update acts-as-taggable-on
2015-03-29 03:39:32 +04:00
Stan Hu
56d87db32c
Reduce Rack Attack false positives by clearing out auth failure count upon
...
successful Git over HTTP authentication.
Add logging when a ban goes into effect for debugging.
Issue #1171
2015-03-24 00:36:46 -07:00
Marin Jankovski
603b88ab5c
Fix typo.
2015-03-20 16:13:03 -07:00
Marin Jankovski
b7229356d5
Change the name of the key used for bitbucket importer.
2015-03-20 15:54:11 -07:00
Dmitriy Zaporozhets
efd8491d49
Revert "Increase timeout for Git-over-HTTP requests."
...
This reverts commit 516bcabbf4
2015-03-19 18:29:20 -07:00
Vyacheslav Slinko
61ed518781
Make email display name configurable
2015-03-11 11:04:23 +07:00
Marin Jankovski
41913fcc09
Merge branch 'smtp_example_update' into 'master'
...
Add link to smtp documentation.
Closes #2070
See merge request !1627
2015-03-09 16:23:43 +00:00
Douwe Maan
516bcabbf4
Increase timeout for Git-over-HTTP requests.
2015-03-04 23:20:47 +01:00
Marin Jankovski
890f14786a
Add link to smtp documentation.
2015-03-04 09:04:23 -08:00
Douwe Maan
f2b37de54b
Fix specs.
2015-02-24 15:07:24 +01:00
Douwe Maan
Dmitriy Zaporozhets
Dmitriy ZaporozhetsandRobert Speicher
Jakub Jirutka
Stan Hu
Marin Jankovski
Roshan Gautam
Jacob Vosmaer
Valery Sizov
Sullivan SENECHALandSullivan SENECHAL
Nihad Abbasov
Vyacheslav Slinko
Marin Jankovski
