Commit Graph
306 Commits
Author SHA1 Message Date
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.

Conflicts:
	Gemfile
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 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Douwe Maan 452ba19cdd Change check to only swap static middleware when it's enabled. 2015-02-21 15:09:17 +01:00
Douwe Maan 6945f4a299 Explain Gitlab::Middleware::Static. 2015-02-20 23:30:06 +01:00
Douwe Maan 938a1381fc Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
Douwe Maan 4310431ee7 Use modified ActionDispatch::Static to let uploads go through to routes. 2015-02-20 12:44:07 +01:00
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Douwe Maan fd21d72b1b Extend issue closing pattern. 2015-02-08 13:56:12 +01:00
Marin Jankovski 631bbe50ff Add openssl_verify_mode option to the smtp configuration example. 2015-02-05 21:49:15 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08: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 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Marco Wessel aad6ceaef9 Allow configuring protection of the default branch upon first push 2015-01-25 17:09:10 +01:00
Sytse Sijbrandij 31bf578d67 Increase password reset timeout since other people trigger it when they create an account for you. 2015-01-23 10:55:12 -08:00
Valery Sizov e36334c770 allow to use http in redirect url 2015-01-22 18:39:05 -08: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
Valery Sizov 20028523b5 Application admin scaffold 2015-01-17 15:40:09 -08: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
Dmitriy Zaporozhets be9f5589ed Merge branch 'oauth_api_doc' into 'master'
OAuth2 API documentation

https://dev.gitlab.org/gitlab/gitlabhq/issues/1713

See merge request !1388
2015-01-13 19:56:43 +00:00
Valery Sizov f07b165ab7 OAuth API documentation update 2015-01-12 19:29:06 -08:00
Jacob Vosmaer dec168932e Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist
Conflicts:
	CHANGELOG
2015-01-08 10:57:08 +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
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets 63be16008e Hide rack profiler by default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-24 15:43:45 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-21 01:11:08 +02:00
Jacob Vosmaer c8b2def2be Add more comments explaining how we block IPs 2014-12-18 11:08:11 +01:00
Jacob Vosmaer 4a389e7616 Another comment fix 2014-12-16 12:46:55 +01:00
Jacob Vosmaer 49f4fe8c6e Fix copy-paste error in comment 2014-12-16 12:43:38 +01:00
Jacob Vosmaer 764eaedf81 Improve Redis::Store monkey-patch robustness 2014-12-16 12:38:44 +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
Jacob Vosmaer b8dfd63eac Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable 2014-12-08 13:39:25 +01:00
Jacob Vosmaer 6491974554 Disable Sidekiq arguments logging by default 2014-12-01 18:58:37 +01:00