Commit Graph
16505 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 66d507a2e4 Merge branch 'fix_ldap_migrator' into 'master'
Fix LDAP migrator to new_syntax

See merge request !362
2015-03-26 15:50:10 +00:00
Valery Sizov 71ffe54721 fix LDAP migrator to new_syntax 2015-03-26 15:39:58 +02:00
Jacob Vosmaer eac762c89b Merge branch 'ldap_doc_fix' into 'master'
Corrected LDAP documentation to include `admin_group` in the new syntax.

Fixes #255

/cc @job

See merge request !338
2015-03-26 10:55:21 +00:00
Marin Jankovski 47a3d6d664 Packages for 7.9.1. 2015-03-25 16:55:54 -07:00
Dmitriy Zaporozhets 9bbbc7723c Fix rubocop 2015-03-25 09:55:37 -07:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
2015-03-25 09:16:09 -07:00
Dmitriy Zaporozhets eda120dc4d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-25 08:37:28 -07:00
Dmitriy Zaporozhets f729f60447 Merge branch 'more-rubocop-styles' into 'master'
More rubocop styles

See merge request !449
2015-03-25 15:37:04 +00:00
Hannes Rosenögger de9d51eea3 Merge branch 'master' into 'master'
Documentation - Markdown - added missing line-break info

as promised, I updated the Markdown documentation with the line-breaks info

See merge request !186
2015-03-25 08:16:16 +00:00
Robert Schilling d554070a62 Fix changelog for 7.9 2015-03-25 08:38:05 +01:00
Robert Schilling d2c76f9bd0 Merge pull request #8988 from atomaka/atomaka/bugfix/gitlab-shell-task
Fix GitLab shell setup spacing
2015-03-25 08:31:53 +01:00
Dmitriy Zaporozhets 8f3f6e9efb Merge branch 'api-internal-errors' into 'master'
Respond with full GitAccess error if user has project read access.

Should help with debugging #1236.

cc @marin

See merge request !437
2015-03-25 04:16:45 +00:00
Dmitriy Zaporozhets d7aecf68e0 Merge branch 'fix-sticky-header' into 'master'
Improve sticky headers in diffs

* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab

See merge request !450
2015-03-25 04:08:49 +00:00
Dmitriy Zaporozhets f2ea9d9f3f Improve sticky headers in diffs
* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab
2015-03-24 19:00:00 -07:00
Dmitriy Zaporozhets 69454e36f7 Style/RedundantReturn enabled 2015-03-24 18:35:57 -07:00
Dmitriy Zaporozhets 6ec8ff069c Enable more rubocop style checks 2015-03-24 18:28:10 -07:00
Dmitriy Zaporozhets b9372c9997 Merge branch 'milestone_and_labels_links' into 'master'
Milestones and labels can be used even when issues are disabled.

When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests.

See merge request !1739
2015-03-25 01:02:34 +00:00
Dmitriy Zaporozhets 05fcfe6daf Merge branch 'mr-button-color' into 'master'
Change merge request button color based on CI status

Green button looks confusing when CI fails

Screenshots:

![ci-warn](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f8166c9acf35f9d886f37f52f975acfb/ci-warn.png)
![ci-can](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d7319c4c567c42a47d79953191384f96/ci-can.png)

See merge request !448
2015-03-24 23:41:42 +00:00
Dmitriy Zaporozhets 2993e2801a Merge branch 'note-avatar-link' into 'master'
Link note avatar to user.

See merge request !446
2015-03-24 23:40:19 +00:00
Dmitriy Zaporozhets 69ab616b38 Merge branch 'user-subscriptions-dependent' into 'master'
Clean up subscriptions when user is deleted.

cc @vsizov

See merge request !439
2015-03-24 23:35:05 +00:00
Dmitriy Zaporozhets a799bd3c26 Merge branch 'update-rugments' into 'master'
Update rugments to 1.0.0.beta6 to fix C# highlighting.

Fixes #1259.

See merge request !435
2015-03-24 23:34:07 +00:00
Dmitriy Zaporozhets 64408fce38 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-24 16:27:51 -07:00
Dmitriy Zaporozhets 0d50a65b32 Fix diff header in discussion blocks 2015-03-24 16:27:40 -07:00
Dmitriy Zaporozhets 1dafe0c6c3 Remove unnecessary newline on Help page 2015-03-24 16:21:39 -07:00
Dmitriy Zaporozhets 35ec08a6e2 Change merge request button color based on CI status 2015-03-24 16:13:29 -07:00
Dmitriy Zaporozhets eb2ce79d2e Merge pull request #9012 from dantudor/patch-1
Unescape branch param to delete
2015-03-24 15:36:03 -07:00
Dmitriy Zaporozhets 3a602c8432 Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors
Complete transition to using color_field for selecting colors
2015-03-24 15:27:58 -07:00
Marin Jankovski bbf6019dd8 Milestones and labels can be used even when issues are disabled. 2015-03-24 15:18:27 -07:00
Dmitriy Zaporozhets fc4af9b197 Merge branch 'git-auth-rack-attack-improvements' into 'master'
Reduce Rack Attack false positives causing 403 errors during HTTP authentication

### What does this MR do?

This MR reduces false positives causing `403 Forbidden` messages after HTTP authentication.

A Git client may attempt to access a repository without a password. If it receives a 401 error, the client often will try again, this time supplying a password. The problem is that `grack_auth.rb` considers a blank password an authentication failure and increases a Redis counter each time this happens. With enough requests, an IP can be banned temporarily even though previous attempts may have been successful. This leads users to see `403 Forbidden` errors until the ban times out (default: 1 hour).

To reduce the chance of a false positive, this MR resets the counter upon a successful authentication from an IP.

In addition, this MR logs when a user has been banned and introduces the ability to disable Rack Attack via a config variable.

### Are there points in the code the reviewer needs to double check?

rack-attack v4.2.0 doesn't support the ability to clear counters out of the box, so `rack_attack_helpers.rb` includes a number of monkey patches to make it work. It looks like this functionality may be added in v4.3.0. I've also sent pull requests to rack-attack to add the functionality necessary to delete a key.

Each time an authentication is successful, the Redis counter for that IP is cleared. I deemed it better to clear the counter than to allow for blank passwords, since the latter seems like a security risk.

### Why was this MR needed?

It was quite difficult to figure out why users were seeing `403 Forbidden`, which is why the log message was added. Users were getting a lot of false positives when accessing repositories with HTTPS. Including the username in the HTTPS URL (e.g. `https://username@mydomain.com/account/repo.git`) caused authentication failures because while the git client provided the username, it left the password blank, leading to an authentication failure.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

See Issue #1171

https://github.com/kickstarter/rack-attack/issues/113

See merge request !392
2015-03-24 21:51:40 +00:00
Dmitriy Zaporozhets 533b5721c6 Merge branch 'unset-assignee' into 'master'
Make sure issue assignee is properly reset.

Previously, when the assignee was reset via the sidebar or bulk edit, `assignee_id` was set to `-1` rather than `null`, which caused the two issues shown below:

![Screen_Shot_2015-03-24_at_16.52.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3c937795c45031c3c72c124ced866598/Screen_Shot_2015-03-24_at_16.52.13.png)

- A "(deleted)" participant
- An empty selectbox in the sidebar, instead of "Select assignee"

See merge request !443
2015-03-24 21:10:18 +00:00
Robert Schilling cabe580395 Merge branch 'update-changelog' into 'master'
Remove duplicate CHANGELOG items for v7.8.0

[ci skip]

See merge request !447
2015-03-24 21:00:46 +00:00
Dmitriy Zaporozhets b8ad3647ad Merge branch 'fix-nested-tasks' into 'master'
Fix nested task lists

When nesting task list items, the parent item is wrapped in a `<p>` tag.  Update the task list parser to handle these paragraph wrappers.

cc @sytse

See merge request !413
2015-03-24 20:57:35 +00:00
Aurelio Jargas 7070ccebc7 Remove duplicate CHANGELOG items for v7.8.0
[ci skip]
2015-03-24 17:15:15 -03:00
Douwe Maan 1651c0bc44 Link note avatar to user. 2015-03-24 18:16:40 +01:00
Dmitriy Zaporozhets d2721c23cd Merge branch 'audit_deploy_key' into 'master'
Audit log for deploy keys

Implements #251

![joxi_screenshot_1427130431169](https://dev.gitlab.org/gitlab/gitlab-ee/uploads/a893f55f27fb4f1c50feb2062f9f26d6/joxi_screenshot_1427130431169.png)

See merge request !360
2015-03-24 16:36:12 +00:00
Andrew Tomaka 83b5a9ae2b Update help texts and default value setting 2015-03-24 12:27:26 -04:00
Douwe Maan f3650d2e5d Add migration. 2015-03-24 17:00:56 +01:00
Douwe Maan 515e9d51df Make sure issue assignee is properly reset. 2015-03-24 16:52:02 +01:00
Douwe Maan e3fb9b1609 Clean up subscriptions when user is deleted. 2015-03-24 15:44:17 +01:00
Valery Sizov f444c9cc6c deploy key events: tests 2015-03-24 15:58:02 +02:00
Douwe Maan 4745424bd3 Respond with full GitAccess error if user has project read access. 2015-03-24 14:12:03 +01:00
Douwe Maan 4830b2be5e Refactor GitAccess to use instance variables. 2015-03-24 14:11:48 +01:00
Dan Tudor 862e1e6f17 Unescape branch param to delete
Branch names that contain `/` return a 405 error when being deleted because the slash is escaped to `%2F`
This patch will unescape the param prior to  executing the delete action.
2015-03-24 13:04:22 +00:00
Valery Sizov 7898922aa0 update changelog 2015-03-24 14:34:42 +02:00
Douwe Maan b45c9115e4 Update rugments to 1.0.0.beta6 to fix C# highlighting. 2015-03-24 10:50:58 +01: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
Dmitriy Zaporozhets c3c9703437 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 17:11:58 -07:00
Dmitriy Zaporozhets 88a15b4e78 Merge branch 'merge-status-without-timestamps' into 'master'
Don't mark merge request as updated when merge status relative to target branch changes.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1254 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2165.

See merge request !431
2015-03-24 00:11:19 +00:00
Dmitriy Zaporozhets 27809a8059 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 17:10:56 -07:00
Dmitriy Zaporozhets 2bb4ea8542 Merge branch 'notes-count-without-system' into 'master'
Don't include system notes in issue/MR comment count.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163.

See merge request !430
2015-03-24 00:10:25 +00:00