Commit Graph
27447 Commits
Author SHA1 Message Date
Tomasz Maczukin c55f517719 Fix php-docker example (for new docker versions)
[ci skip]
2016-04-25 11:35:33 +02:00
Rémy Coutable 2eee6a0cbc Merge branch 'fix/hidden-build-validation-in-ci-yaml' into 'master'
Add posibility to define a hidden job without 'script' in .gitlab-ci.yml

References #15451

/cc @ayufan 

See merge request !3849
2016-04-25 08:28:27 +00:00
Robert Speicher 954af77b39 Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master'
Hiding future dates on contribution calendar

Fixes #9036

See merge request !2628
2016-04-24 19:57:56 +00:00
Jacob Schatz 1cfd41591b Merge branch 'rs-todo-middle-click' into 'master'
Allow middle-click on a Todo row to open in a new tab



See merge request !3899
2016-04-24 19:52:00 +00:00
Luke Howell 2dd4f796b1 Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. 2016-04-24 14:14:29 -05:00
Robert Speicher aace81ca37 Allow middle-click on a Todo row to open in a new tab 2016-04-24 15:01:52 -04:00
Achilleas Pipinellis 7acea6bde9 Merge branch 'add-tags-to-fetch' into 'master'
Add --tags to fetching gitlab-shell to ensure tags are downloaded

Closes #15525

See merge request !3896
2016-04-23 05:54:22 +00:00
Stan Hu 06f35914da Add --tags to fetching gitlab-shell to ensure tags are downloaded
Closes #15525
2016-04-22 16:06:24 -07:00
Robert Speicher b1adff828c Merge branch 'upgrade-sidekiq' into 'master'
Update Sidekiq and related gems (bundle update sidekiq)

Closes #15079

See merge request !3817
2016-04-22 23:03:07 +00:00
Robert Speicher c56da88115 Merge branch 'rs-update-binstubs' into 'master'
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'

See merge request !3887
2016-04-22 20:48:20 +00:00
Tomasz Maczukin 4b23b5cdf4 Move CHANGELOG entry to 8.7.1 2016-04-22 22:09:50 +02:00
Tomasz Maczukin 9a1b174d5c Fix some typos 2016-04-22 22:08:38 +02:00
Tomasz Maczukin a2e2989637 Modify code formatting 2016-04-22 22:08:37 +02:00
Tomasz Maczukin 5018d7d5b7 Update CHANGELOG
[ci skip]
2016-04-22 22:08:36 +02:00
Tomasz Maczukin 0ccf629525 Simplify the GitlabCiYamlProcessor#initial_parsing method 2016-04-22 22:08:36 +02:00
Tomasz Maczukin e1b3ce5468 Fix formatting 2016-04-22 22:08:35 +02:00
Tomasz Maczukin 8dd27b47ea Add posibility to define a hidden job without 'script' in .gitlab-ci.yml 2016-04-22 22:08:34 +02:00
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