Commit Graph
15150 Commits
Author SHA1 Message Date
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 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
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
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
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
Dmitriy Zaporozhets 2cd6cc7fed Merge branch 'improve-diff-header' into 'master'
Fix file mode going to next line in diff header

See merge request !432
2015-03-24 00:09:40 +00:00
Andrew Tomaka 4349e524f4 Update broadcast messages to use color_field 2015-03-23 17:22:50 -04:00
Douwe Maan 17192d1bb3 Merge branch 'keyword-args-2.0' into 'master'
Don't use required keyword arguments to maintain support for Ruby 2.0.

See merge request !433
2015-03-23 20:47:17 +00:00
Douwe Maan 8a7b4eeb0e Revert "Update gemnasium-gitlab-service gem"
This reverts commit af522ede14.
2015-03-23 21:21:23 +01:00
Douwe Maan f039e8e03f Don't use required keyword arguments to maintain support for Ruby 2.0. 2015-03-23 21:20:48 +01:00
Robert Schilling c03374919f Merge pull request #9006 from hebbet/patch-1
Change comment in blue ui to match other scss
2015-03-23 20:38:21 +01:00
hebbet 97dd1046e7 Change comment in blue ui to match other scss
Change comment in blue ui to match other scss files
2015-03-23 20:07:13 +01:00
Dmitriy Zaporozhets 2953e0d19b Merge branch 'emailsonpush-create-delete' into 'master'
Send EmailsOnPush email when branch or tag is created or deleted.

Addresses #1951, #1957 and #1925.

![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png)

![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png)

![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png)

![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png)

See merge request !1709
2015-03-23 16:48:27 +00:00
Dmitriy Zaporozhets 54326f490e Merge branch 'no-comment-bubble' into 'master'
Don't show commit comment button when user is not signed in.

Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167.

See merge request !429
2015-03-23 16:47:16 +00:00
Dmitriy Zaporozhets c5d65ed62f Merge branch 'userpage-activity-scroll'
Conflicts:
	app/controllers/users_controller.rb
2015-03-23 09:45:40 -07:00
Dmitriy Zaporozhets 81d603e2c1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-23 09:44:28 -07:00
Dmitriy Zaporozhets 78fe7270ab Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-23 09:44:20 -07:00
Dmitriy Zaporozhets e24da35984 Merge branch 'improve-contributions-calendar' into 'master'
Replace commits calendar with contributions calendar

* count opening of issues and merge requests
* dont trigger git repository - use events from database
* count pushes instead of commits for faster and easier counting
* much-much faster since does not affected by repository size

See merge request !420
2015-03-23 16:40:55 +00:00
Dmitriy Zaporozhets 61700f619c Fix file mode going to next line in diff header 2015-03-23 09:38:52 -07:00
Douwe Maan ceaa2f5c26 Merge pull request #9001 from vichak/master
Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
2015-03-23 17:37:17 +01:00
Douwe Maan 70fa9d5629 Don't mark merge request as updated when merge status relative to target branch changes. 2015-03-23 17:30:19 +01:00
Dmitriy Zaporozhets 66e3999287 Merge branch 'your' into 'master'
Update views to single form of address. Change "my" to "your"

Part of user experience. Every software (twitter, facebook etc) talks to you like "change your password" but not "change my password".

cc @sytse @job

See merge request !1736
2015-03-23 16:12:51 +00:00
vichak e5b8cf0a8f Fix #8966 Remove Milestones/Labels from project navbar when Isses disabled 2015-03-23 16:48:50 +01:00
Douwe Maan 6b92236eeb Don't include system notes in issue/MR comment count. 2015-03-23 16:43:08 +01:00
Douwe Maan a30645c68f Don't show commit comment button when user is not signed in. 2015-03-23 16:17:10 +01:00
Douwe Maan 3ca34bb8f0 Merge branch 'fix-admin-service-template-config' into 'master'
Include missing events and fix save functionality in admin service template settings form

### What does this MR do?

This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings.

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

No.

### Why was this MR needed?

Because the service template form was broken and untested.

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

#1275

Before:

![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png)

After:

![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png)

See merge request !427
2015-03-23 14:58:15 +00:00