Commit Graph
20594 Commits
Author SHA1 Message Date
Tomasz Maczukin 067b8df827 Update VERSION to 8.2.6 v8.2.6 2016-06-15 02:30:21 +02:00
Tomasz Maczukin fc67a44dc4 Update CHANGELOG for 8.2.6 2016-06-14 19:25:19 +02:00
Robert SpeicherandTomasz Maczukin c041db4f8d Merge branch '17298-wiki-xss' into 'master'
Forbid scripting for wiki files

Wiki files (not pages - files in the repo) are just sent to the browser
with whatever content-type the mime_types gem assigns to them based on
their extension. As this is from the same domain as the GitLab
application, this is an XSS vulnerability.

Set a CSP forbidding all sources for scripting, CSS, XHR, etc. on these
files.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17298.

See merge request !1969
2016-06-14 19:24:18 +02:00
Tomasz Maczukin 0b5cd653a9 Update CHANGELOG 2016-06-14 15:44:50 +02:00
Douwe MaanandTomasz Maczukin 6d88aabd7c Merge branch 'fix/unauthorized-access-to-build-data' into 'master'
Remove 'unscoped' from project builds selection

This is a fix for this security bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/18188

/cc @kamil @grzegorz @stanhu

See merge request !1968
2016-06-14 15:30:16 +02:00
Robert Speicher 680453b740 Update VERSION to 8.2.5 v8.2.5 2016-04-27 17:13:18 -04:00
Robert Speicher 15c667d897 Update CHANGELOG for 8.2.5
[ci skip]
2016-04-26 17:55:22 -04:00
Robert SpeicherandRobert Speicher 076632f170 Merge branch 'rs-notes-privilege-escalation' into 'master'
Prevent privilege escalation via notes API

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

See merge request !1964
2016-04-26 16:31:48 -04:00
Robert Speicher 23bc10ec79 Update scripts/prepare_build.sh from master 2016-04-26 11:00:58 -04:00
Robert SpeicherandRémy Coutable 7eda355e3a Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master'
Prevent information disclosure via new merge request page

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

See merge request !1963

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 12:00:10 +02:00
Grzegorz BizonandRémy Coutable f349d939c1 Merge branch 'fix/private-labels-permissions' into 'master'
Fix vulnerability that leaks private labels and milestones

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

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

`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

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 11:52:59 +02:00
Robert SpeicherandRémy Coutable 7fba61da97 Merge branch 'fix-private-snippet-api' into 'master'
Prevent information disclosure via snippet API

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

See merge request !1958

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 11:17:50 +02:00
Rémy CoutableandRémy Coutable 20cb5a7b3e Merge branch 'fix-project-hook-delete-permissions' into 'master'
Prevent users from deleting Webhooks via API they do not own

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

See merge request !1959

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-26 11:04:15 +02:00
Robert Speicher 88e60bbbcb Update .gitlab-ci.yml 2016-04-25 21:28:31 -04:00
Robert SpeicherandRobert Speicher 15f8fb3164 Merge branch 'fix-impersonation-issue' into 'master'
Prevent privilege escalation via "impersonate" feature

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

See merge request !1956
2016-04-25 17:03:43 -04:00
Robert SpeicherandRobert Speicher 2ca0e9d62e 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-25 15:50:06 -04:00
Robert Speicher a987a19ca0 Version 8.2.4 v8.2.4 2016-03-17 18:07:03 -04:00
Robert Speicher d6e2cbb3dd Merge branch '8-2-git-2-7-4' into '8-2-stable'
Bump Git version requirement to 2.7.4 (for 8.2)

[ci skip]

See merge request !3285
2016-03-17 21:48:36 +00:00
Douwe Maan 303a7caa4c Bump Git version requirement to 2.7.4 (for 8.2) 2016-03-17 22:35:29 +01:00
Douwe MaanandRobert Speicher 1322bd78cf Merge branch 'rs-issue-4032' into 'master'
Fix note polling

Closes #4032

See merge request !2084
2015-12-15 12:16:17 -05:00
Robert Speicher 19daba8a6f Version 8.2.3 v8.2.3 2015-12-10 12:25:30 -05:00
Robert Speicher c6b332c390 Update CHANGELOG
[ci skip]
2015-12-09 22:33:32 -05:00
Robert SpeicherandRobert Speicher 0c0854c86a Merge branch 'devise_paranoid_mode' into 'master'
Enable Devise paranoid mode and ensure the returned message is the same
every time. This will prevent user enumeration (low impact). 

Prior to this change a user could type an email in the password reset
field and if the email didn't exist it returned an error. If the email
was valid it returned a message saying the forgot password link had been
emailed. After this change the user will receive a message that if the
email is in our database the reset link will be emailed. 

I also changed the throttle mechanism so it still works the same but
now returns the exact same message as above. Previously it would say
'You've already sent a request. Wait a few minutes'. This also allows
user enumeration, although it requires a double-check.

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624

See merge request !2044
2015-12-09 20:59:14 -05:00
Robert SpeicherandRobert Speicher 9888a9725b Merge branch 'yaml_safe_load' into 'master'
Use YAML.safe_load

See merge request !1941
2015-12-09 18:43:44 -05:00
Douwe MaanandRobert Speicher 0ece3d6552 Merge branch 'fix-merge-request-that-removes-submodule' into 'master'
Fix 500 error when creating a merge request that removes a submodule

Fixes #3476

See merge request !1989
2015-12-08 17:15:37 -05:00
Robert Speicher 3839706253 Update CHANGELOG
[ci skip]
2015-12-07 14:43:01 -05:00
Grzegorz BizonandRobert Speicher 23975e093b Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 14:33:36 -05:00
Valery SizovandRobert Speicher e70ac793a2 Merge branch 'webhook_payload_with_changes' into 'master'
Add added, modified and removed properties to commit object in webhook

https://gitlab.com/gitlab-org/gitlab-ee/issues/20

See merge request !1988
2015-12-07 14:31:49 -05:00
Douwe MaanandRobert Speicher 46d24898ed Merge branch 'fix-global-milestones-error-500' into 'master'
Fix Error 500 when creating global milestones with Unicode characters

Two issues:

1. The constraints in the resources were incorrect. Here's what it was before:

```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

In this case, id is actually the title of the milestone, which can be anything at the moment.

After:
```
group_milestone  GET /groups/:group_id/milestones/:id(.:format)  groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```

2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:

```
ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):
```

This change uses the babosa library to create a better slug, which surprisingly
isn't actually used by the global milestone controllers. Instead, they use the
title passed as a query string for some reason.

Closes https://github.com/gitlabhq/gitlabhq/issues/9881

See merge request !1983
2015-12-07 14:28:31 -05:00
Job van der VoortandRobert Speicher a418f64100 Merge branch 'fix_permission_doc' into 'master'
fixed the documentation of the Guest role in permission.md

This MR fixes the documentation of the Guest role.

closes gitlab-org/gitlab-ce#3777

[ci skip]

See merge request !1952
2015-12-05 14:55:48 -05:00
Dmitriy ZaporozhetsandRobert Speicher cd4a33120a Merge branch 'fix-application-settings-not-expiring' into 'master'
Fix application settings cache not expiring after changes

cache_key is an instance method that relies on updated_at. When changes
were made, the time-dependent key was being used instead of X.application_setting.last.

Closes #3609

See merge request !1972
2015-12-04 14:36:30 -05:00
Robert Speicher 08fae2fd05 Version 8.2.2 v8.2.2 2015-12-02 11:48:27 -05:00
Dmitriy ZaporozhetsandRobert Speicher d2e60e7eed Merge branch 'gmail_actions_links_on_set_of_emails' into 'master'
Show Gmail actions links only on expected set of emails



See merge request !1901
2015-12-02 11:17:56 -05:00
Robert SpeicherandRobert Speicher e664de6d59 Merge branch 'install-guide-gitlab-shell-version' into 'master'
Install gitlab-shell 2.6.8 in installations from source

[ci skip]

See merge request !1932
2015-12-01 16:31:55 -05:00
Valery SizovandRobert Speicher 49db8b7970 Merge branch 'upload_hook' into 'master'
Fire update hook from GitLab

https://gitlab.com/gitlab-org/gitlab-ce/issues/3069

See merge request !1882
2015-11-30 14:05:35 -05:00
Robert Speicher 45f15602c2 Update CHANGELOG
[ci skip]
2015-11-30 12:04:20 -05:00
Robert Speicher 531272a520 Merge branch 'stanhu/gitlab-ce-fix-404-after-project-removal'
See merge request !1916
2015-11-30 12:03:13 -05:00
Dmitriy ZaporozhetsandRobert Speicher d2f21bf72a Merge branch 'fix-admin-page-personal-projects' into 'master'
Fix Error 500 when viewing user's personal projects from admin page

This is a regression introduced in 4d7f00f.

Closes #3680

Closes https://github.com/gitlabhq/gitlabhq/issues/9861

Closes gitlab-org/gitlab-ee#90

See merge request !1909
2015-11-30 11:57:26 -05:00
Dmitriy ZaporozhetsandRobert Speicher 3b9a910938 Merge branch 'expire-application-settings-startup' of https://gitlab.com/stanhu/gitlab-ce 2015-11-30 11:54:44 -05:00
Robert Speicher 0bbf7563a6 Update CHANGELOG 2015-11-27 14:45:08 -05:00
Douwe MaanandRobert Speicher 412120de02 Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow' 2015-11-27 14:43:42 -05:00
Robert SpeicherandRobert Speicher f160bd3f0c Merge branch 'nginx-workhorse-upload-limit' into 'master'
Nginx workhorse upload limit

See merge request !1919
2015-11-27 14:41:23 -05:00
Jacob Vosmaer e53c0c5572 Version 8.2.1 v8.2.1 2015-11-25 14:45:29 +01:00
Dmitriy Zaporozhets 9a644c1611 Merge branch 'bump-gitlab-shell-stable' into '8-2-stable'
Bump gitlab-shell to 2.6.8 in stable

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For gitlab/gitlabhq#2635

See merge request !1940
2015-11-25 13:18:07 +00:00
Dmitriy Zaporozhets 80c7a95882 Bump gitlab-shell to 2.6.8
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-25 13:10:43 +01:00
Robert SpeicherandRobert Speicher e696bdcdaa Merge branch 'session_expire_delay_cannot_be_nil' into 'master'
Maybe rescue session_expire_delay by setting a default value.

Related to gitlab-org/omnibus-gitlab#956

See merge request !1880
2015-11-24 21:28:00 -05:00
Dmitriy ZaporozhetsandRobert Speicher 367d178564 Merge branch 'required_version_and_docs_update' into 'master'
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
2015-11-24 12:01:39 -05:00
Robert SpeicherandRobert Speicher 69383ac266 Merge branch 'ci-artifacts-path' into 'master'
Expose artifacts path

This fixes broken artifacts storage path.

Fixes #3607 
Fixes #3608

Related: gitlab-org/omnibus-gitlab!544

See merge request !1869
2015-11-23 17:19:54 -05:00
Robert Speicher 320c86abd7 Update CHANGELOG
[ci skip]
2015-11-23 16:53:35 -05:00
Robert SpeicherandRobert Speicher 3017037fc7 Merge branch 'ci-fix-500' into 'master'
Fix 500 when using CI

- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template

Fixes #3556 

See merge request !1873
2015-11-23 16:53:19 -05:00