Commit Graph
27429 Commits
Author SHA1 Message Date
Robert Speicher fdc8b05ab1 Re-generate Spring binstubs for updated version of Spring
Prevents output like this:

    Array values in the parameter are deprecated. Please use a String or nil.
    An Array was passed in from bin/rspec:3:in `load'
2016-04-22 16:00:56 -04:00
Drew Blessing 80893cad67 Merge branch 'ha_docs' into 'master'
Fix broken link in HA docs

Whoops! Fix broken link in docs from gitlab-org/gitlab-ce!3579

See merge request !3890
2016-04-22 18:25:49 +00:00
Drew Blessing 0bb85509c9 Fix link 2016-04-22 13:24:36 -05:00
Drew Blessing 56f66e4cf4 Merge branch 'ha_docs' into 'master'
Updated HA docs and open to public

Closes https://dev.gitlab.org/gitlab/organization/issues/624

We still need to go through the old gitlab.com/standard/high-availability and move relevant docs over, plus do some docs on DRBD. However, I think this is a good volume for the first pass. Can we get this out there and then iterate?

cc/ @axil @patricio For your review, please.

See merge request !3579
2016-04-22 18:18:55 +00:00
Drew Blessing 34ea1d2cfe New HA docs [ci skip] 2016-04-22 13:18:06 -05:00
Drew Blessing c38f2645ed Merge branch 'sidekiq_troubleshooting' into 'master'
Add Sidekiq troubleshooting docs

Closes #15287 

cc/ @stanhu @jacobvosmaer @dstanley

See merge request !3802
2016-04-22 18:13:03 +00:00
Drew Blessing 3e16997fd7 Add Sidekiq troubleshooting docs [ci skip] 2016-04-22 13:11:53 -05:00
Robert Speicher d83d43c553 Merge branch 'rs-todos-feature-spec' into 'master'
Refactor Todos feature spec to be faster and less brittle

We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.

See merge request !3889
2016-04-22 17:51:08 +00:00
Robert Speicher 84d3649d57 Merge branch '15513-fix-undefined-can-method' into 'master'
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
2016-04-22 17:38:10 +00:00
Robert Speicher bdd844f312 Refactor Todos feature spec to be faster and less brittle
We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.
2016-04-22 13:08:11 -04:00
Jacob Schatz 7d199b7fcc Merge branch 'escape-label-title' into 'master'
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
2016-04-22 15:56:54 +00:00
Robert Speicher 10aaea1c91 Merge branch 'fix/cherry-pick-specs-location' into 'master'
Move cherry-pick feature specs to proper directory

Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`.

Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`).

See merge request !3875
2016-04-22 15:33:23 +00:00
Achilleas Pipinellis c75b350cef Merge branch 'doc/gitlab-shell-tag' into 'master'
Bump gitlab-shell to 2.7.2

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15525

See merge request !3884
2016-04-22 15:16:49 +00:00
Achilleas Pipinellis f063c3184b Bump gitlab-shell to 2.7.2
[ci skip]
2016-04-22 18:15:03 +03:00
Rémy Coutable c56ae831db Merge branch 'issue_3799' into 'master'
Add tests for filtering owned projects

REF: #3799

See merge request !3873
2016-04-22 15:11:14 +00:00
Dmitriy Zaporozhets a600b4b1c0 Merge branch 'fix-issue-with-assignee-not-updating' into 'master'
Fixed issue with assignee object not being returned

Closes #15515

See merge request !3877
2016-04-22 14:58:18 +00:00
Rémy Coutable 951e3459e1 Use the can? helper instead of current_user.can?
Fixes #15513.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-22 15:48:58 +02:00
Alfredo Sumaran 21a1e15677 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-22 08:37:15 -05:00
Phil Hughes 83adcf19b7 Escapes label title in filters
Fixes #15522
2016-04-22 14:32:14 +01:00
Phil Hughes 32be8bd2b1 Fixed issue with assignee object not being returned
Closes #15515
2016-04-22 13:30:58 +01:00
Grzegorz Bizon b711fc0abd Move cherry-pick feature specs to proper directory 2016-04-22 13:34:03 +02:00
Alfredo Sumaran e0c07b5e3d Add tests for filtering owned projects 2016-04-22 06:19:43 -05:00
Rémy Coutable d5398e9656 Merge branch 'issue_3799' into 'master'
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
2016-04-22 08:40:01 +00:00
Achilleas Pipinellis 15e225940b Merge branch 'doc-gh-import-additions' into 'master'
Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867
2016-04-22 08:36:37 +00:00
Robert Speicher 2193a3535b Merge branch 'confirmation-screen' into 'master'
Improved email confirmation UX

Closes #4228

See merge request !3184
2016-04-22 08:34:59 +00:00
Achilleas Pipinellis 846a9ef5ad Add newest enhancements to GH importer docs
[ci skip]
2016-04-22 11:20:37 +03:00
Achilleas Pipinellis c39032937a Merge branch 'doc_note_cherry_pick' into 'master'
Use new Note styleguide



See merge request !3866
2016-04-22 07:50:35 +00:00
Rémy Coutable 5a8873f362 Merge branch 'rs-diff_view' into 'master'
Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732
2016-04-22 07:49:46 +00:00
Achilleas Pipinellis de39959f55 Use new Note styleguide
[ci skip]
2016-04-22 10:42:30 +03:00
Grzegorz Bizon 988dad4649 Merge branch 'fix/private-labels-permissions' into 'master'
Fix vulnerability that leaks private labels and milestones

## Summary

This fixes vulnerability that leaks information about private labels and milestones because of  insecure direct object reference in issueable create service.
This affects merge requests and issues.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

## Fix

This MR introduces additional check that rejects labels and milestone that does not belong to the same project issue/merg request does.

## Further work

`IssuableBaseService` may benefit from encapsulating filters in separate class/module, which then may improve coherency in this class.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439

See merge request !1954
2016-04-22 06:51:40 +00:00
Grzegorz Bizon 55df95c388 Add Changelog entry for private labels security fix 2016-04-22 08:02:02 +02:00
Grzegorz Bizon 01ab6d704c Use association search in issuable create service 2016-04-22 08:01:50 +02:00
Grzegorz Bizon 006d8b268c Add affinity checks in issue create service 2016-04-22 08:01:50 +02:00
Grzegorz Bizon 8df63d1513 Update specs to accomodate issuable assign changes 2016-04-22 08:00:57 +02:00
Grzegorz Bizon 4adfd501a5 Verify label affiliation before assigning to issue
This also verify if milestone belongs to correct project before creating
a new issue.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15439
2016-04-22 07:59:08 +02:00
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX
Closes #4228
2016-04-21 20:20:09 -04:00
Robert Speicher aea9799197 Merge branch 'label-text-color-sidebar' into 'master'
Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846
2016-04-21 23:13:38 +00:00
Yorick Peterse a4510729a6 Merge branch '15465-fix-sort-by-due-date' into 'master'
Remove the `.distinct` when finding issues

See merge request !3858
2016-04-21 22:26:53 +00:00
Yorick Peterse 0e2b644983 Merge branch 'repository-checks-default-off' into 'master'
Disable 'repository check' feature in 8.7.0

See merge request !3856
2016-04-21 22:26:34 +00:00
Yorick Peterse d35dde0129 Merge branch 'remove-update-files' into 'master'
Removed JS update templates

See merge request !3814
2016-04-21 22:23:41 +00:00
Alfredo Sumaran c9fe9f59d2 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-21 16:03:33 -05:00
Alfredo Sumaran 80ae3790b4 Update CHANGELOG 2016-04-21 16:03:21 -05:00
Alfredo Sumaran 41cee8c38e Do not display filters if user if there's no current_user 2016-04-21 16:03:14 -05:00
Alfredo Sumaran 3f574c4db9 Use compact syntax 2016-04-21 16:02:00 -05:00
Jacob Schatz fc038916a8 Merge branch '15413-firefox-line-numbers' into 'master'
Remove float from blame link icon

Closes #15413   
<img src="/uploads/af6aea9102e1b42e5e92783ce818863c/Screen_Shot_2016-04-21_at_1.57.56_PM.png" width="200px">



See merge request !3861
2016-04-21 21:00:34 +00:00
Robert Speicher 522f2b2caa Merge remote-tracking branch 'dev/master' into 'master' 2016-04-21 16:50:34 -04:00
Robert Speicher 1ea2408ba3 Merge branch 'dev_issue_15331' into 'master'
Fixes window.opener bug

Adds `noreferrer` value to rel attribute for external links

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331

See merge request !1953
2016-04-21 20:49:41 +00:00
Annabel Dunstone 8277bd7968 Remove float from icon 2016-04-21 15:00:03 -05:00
Achilleas Pipinellis c22c4048ce Merge branch 'doc-updating-gitlab' into 'master'
Refactor the update documentation



See merge request !3822
2016-04-21 19:51:57 +00:00
Alfredo Sumaran 72debd840c Fix failing spec 2016-04-21 14:38:44 -05:00