27243 Commits
Author SHA1 Message Date
Yorick Peterse 1d72f95689 Version 8.7.3 v8.7.3 2016-05-06 10:54:34 +02:00
Yorick Peterse 05be99bf3d Removed 8.8.0 changelog entries 2016-05-05 19:44:48 +02:00
Yorick Peterse 4de1d784ba Updated CHANGELOG entries per master 2016-05-05 19:43:55 +02:00
Douwe MaanandYorick Peterse 0f6894d6a6 Merge branch 'create-wikis-during-check' into 'master'
Initialize wikis on legacy projects during check

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

Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423

See merge request !3931
2016-05-05 19:37:04 +02:00
Douwe MaanandYorick Peterse 4f9d82a9e3 Merge branch 'gh-review-comments' into 'master'
Fix the line code when importing PR review comments from GitHub

Pull Request Review Comments are comments on a portion of the unified diff.

Closes #17205

See merge request !4010
2016-05-05 19:35:54 +02:00
Yorick Peterse f3e41f00d5 Moved TeamCity fix to 8.7.3 2016-05-05 10:08:13 +02:00
Stan HuandYorick Peterse ee11b9778c Merge branch 'fix-team-build-state-in-mr-widget' into 'master'
Merge request widget displays TeamCity build state and code coverage correctly again

## What does this MR do?
This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer.

## Are there points in the code the reviewer needs to double check?
The changes are quite simple, so please simply double check them.

## Why was this MR needed?
This MR is needed to make the TeamCity build status working again.

## What are the relevant issue numbers?
#17080 

See merge request !3998
2016-05-05 10:06:59 +02:00
Yorick Peterse 75635e2ba3 Merge branch 'add-instrumentation-for-15137' into 'master'
Instrument methods used in email diffs

See merge request !4038
2016-05-04 14:46:18 +00:00
Yorick Peterse 213974bc9b Version 8.7.2 v8.7.2 2016-05-03 14:58:56 +02:00
Yorick Peterse e81b9ab828 Corrected the changelog for 8.7.2 2016-05-03 12:08:11 +02:00
Jacob SchatzandYorick Peterse 785bce1cb2 Merge branch 'notification-email-badge-alignment' into 'master'
Updated spacing between notification label and button

![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png)

Closes #16552

See merge request !3965
2016-05-03 09:43:03 +00:00
Robert SpeicherandYorick Peterse aa664af3dd Merge branch '15527-fix-wiki-page-creation-issue' into 'master'
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
2016-05-03 09:42:16 +00:00
Robert Speicher 6f0cadca87 Merge remote-tracking branch 'dev/8-7-stable' into 8-7-stable 2016-05-02 20:00:11 -04:00
Yorick Peterse e0c504cc68 Added CHANGELOG for 8.7.2 2016-04-29 00:39:55 +02:00
Jacob SchatzandYorick Peterse ea066cc1bf Merge branch 'async-new-branch-button' into 'master'
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
2016-04-29 00:33:45 +02:00
Yorick Peterse c6ae6c7414 Marked 8.7.1 as released in the changelog 2016-04-28 10:22:07 +00:00
Jacob SchatzandYorick Peterse 81dafb7113 Merge branch 'sidebar-label-link' into 'master'
Updated label links to work correctly for filtering

See !3846#note_5033951

See merge request !3920
2016-04-27 19:39:12 +00:00
Robert Speicher 93187cbe20 Update VERSION to 8.7.1 v8.7.1 2016-04-27 14:50:08 -04:00
Rémy CoutableandRobert Speicher 0624d6a7f1 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
2016-04-27 13:32:55 -04:00
Robert Speicher d2d36d5e1c Update CHANGELOG for 8.7.1 security patches
[ci skip]
2016-04-27 13:12:19 -04:00
Robert Speicher f50306a7b1 Merge remote-tracking branch 'origin/8-7-stable' into 'dev/8-7-stable' 2016-04-27 12:48:05 -04:00
Robert SpeicherandYorick Peterse 6044fd7e46 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-27 08:43:33 +00:00
Jacob SchatzandYorick Peterse a1db1355d2 Merge branch 'master' into 'master'
Fixed width of .search-location-badge as it was causing issues in Safari.

Fixed width of .search-location-badge as it was causing issues in Safari.

Fixes issue #15541 and is a minor CSS only change so [ci skip]

# Before

Safari:
![Screen_Shot_2016-04-24_at_22.35.38](/uploads/74388670fde3af94429d83b954833bd3/Screen_Shot_2016-04-24_at_22.35.38.png)

# After

Safari:
![Screen_Shot_2016-04-24_at_21.59.49](/uploads/177d0d8fda665165dff5006930604fc6/Screen_Shot_2016-04-24_at_21.59.49.png)

Chrome:
![Screen_Shot_2016-04-24_at_21.59.40](/uploads/6764cd5864901210f4f8eff4388fd6db/Screen_Shot_2016-04-24_at_21.59.40.png)

# CSS class referenced in the following files:

`./app/assets/javascripts/search_autocomplete.js.coffee`

`./app/assets/stylesheets/pages/search.scss`

…and is visible on the search bar on every page.

See merge request !3900
2016-04-27 08:38:28 +00:00
Jacob SchatzandYorick Peterse f2afc5dd26 Merge branch 'emoji-unicode-fix' into 'master'
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
2016-04-26 16:05:12 +00:00
Robert SpeicherandYorick Peterse c8776b0c57 Merge branch '15579-filter-milestone-confidential-issues-api' into 'master'
Prevent information disclosure via milestone API

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

See merge request !1961
2016-04-26 08:39:02 +00:00
Robert SpeicherandYorick Peterse 3b83ed2125 Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'
Prevent XSS via custom issue tracker URL

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

See merge request !1955
2016-04-25 21:55:52 +00:00
Robert SpeicherandYorick Peterse df1b1e58be 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
2016-04-25 21:53:17 +00:00
Robert SpeicherandYorick Peterse 61013f11bb 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 21:52:40 +00:00
Robert SpeicherandYorick Peterse 516900b9dc 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
2016-04-25 21:51:52 +00:00
Jacob SchatzandYorick Peterse f03c454809 Merge branch 'issue_15434' into 'master'
Fixes XSS injection

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

**Without the fix**

![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif)


**With the fix**

![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif)


See merge request !1952
2016-04-25 21:50:32 +00:00
Robert SpeicherandYorick Peterse 9cc7e37ebe 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 21:49:24 +00:00
Jacob SchatzandYorick Peterse 320e0b7fa7 Merge branch 'blur-award-btn' into 'master'
Triggers blur after clicking award button

![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif)

Fixes #15511

See merge request !3881
2016-04-25 21:55:11 +02:00
Jacob SchatzandYorick Peterse 383984b973 Merge branch 'project-dropdown-link-click-fix' into 'master'
Fixed issue with project dropdown links not being clickable



See merge request !3870
2016-04-25 21:55:02 +02:00
Dmitriy ZaporozhetsandYorick Peterse 44a18c64e3 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-25 21:54:55 +02:00
Rémy CoutableandYorick Peterse 2df5ea681a 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 21:54:25 +02:00
Yorick Peterse a3783cde1a Merge branch 'fix-cache-invalidations' into 'master'
Fix Error 500 due to stale cache when projects are renamed or transferred

See merge request !3865
2016-04-25 21:54:09 +02:00
Rémy CoutableandYorick Peterse 8d7c63b708 Merge branch '15470-fix-unknown-license-not-shown' into 'master'
Fix license detection to detect all license files, not only known licenses

Fixes #15470.

See merge request !3878
2016-04-25 21:53:19 +02:00
Robert SpeicherandYorick Peterse 0325d26d06 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-25 21:53:10 +02:00
Robert SpeicherandYorick Peterse 009e2ed1c7 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-25 21:52:54 +02:00
Jacob SchatzandYorick Peterse 9c1087ef8e 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-25 19:50:59 +00:00
Achilleas PipinellisandYorick Peterse 0eadb29d8e 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-25 19:50:27 +00:00
Jacob SchatzandYorick Peterse 438f41594a Merge branch 'escape-label-title' into 'master'
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
2016-04-25 19:49:57 +00:00
Robert SpeicherandYorick Peterse 777a8b2af5 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-25 19:49:39 +00:00
Achilleas PipinellisandYorick Peterse 6c68a030c9 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-25 19:49:21 +00:00
Jacob SchatzandYorick Peterse 839692df6c Merge branch 'word-break' into 'master'
Don't break line in middle of word

<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">

See merge request !3864
2016-04-25 19:48:14 +00:00
Yorick Peterse f2a3f70d6f Version 8.7.0 v8.7.0 2016-04-22 12:01:37 +02:00
Yorick Peterse 4066d4f7a1 Removed "unreleased" for 8.7.0
[ci skip]
2016-04-22 11:24:44 +02:00
Rémy CoutableandYorick Peterse 76c215cbd0 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 10:59:09 +02:00
Achilleas PipinellisandYorick Peterse c291e9b553 Merge branch 'doc-gh-import-additions' into 'master'
Add newest enhancements to GH importer docs

[ci skip]

See merge request !3867
2016-04-22 10:57:04 +02:00
Achilleas PipinellisandYorick Peterse c465c90068 Merge branch 'doc_note_cherry_pick' into 'master'
Use new Note styleguide



See merge request !3866
2016-04-22 10:56:49 +02:00