27270 Commits
Author SHA1 Message Date
Yorick Peterse 143d9e800a Version 8.7.6 v8.7.6 2016-05-20 12:57:41 -05:00
Yorick Peterse 6562390823 Fixed CHANGELOG for 8.7.6, properly 2016-05-19 15:25:57 -05:00
Yorick Peterse 154a914742 Fixed CHANGELOG for 8.7.6 2016-05-19 15:22:37 -05:00
Robert SpeicherandYorick Peterse fa90dcc16a Merge branch 'fix/gitlab-import-data' into 'master'
fix typo making gitlab.com importing to fail

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4181
2016-05-19 13:07:27 -05:00
Rémy CoutableandYorick Peterse 4b0cde7f19 Merge branch 'wiki-fix-reloaded' into 'master'
Use the relative url prefix for links in Wiki

Retry of gitlab-org/gitlab-ce!4026

@rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22

Fixes #17071 



See merge request !4131
2016-05-19 13:07:06 -05:00
Rémy CoutableandYorick Peterse 32ef666d13 Merge branch 'fix/import-data-issue' into 'master'
Create import data in service and fix timing issues when scheduling job

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

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

See merge request !4106
2016-05-19 13:06:36 -05:00
Yorick Peterse 0e8b7d8ebd Version 8.7.5 v8.7.5 2016-05-12 16:35:19 +02:00
Yorick Peterse ec447ee769 Moved !3886 changelog entry to 8.7.5 2016-05-12 15:08:33 +02:00
Robert SpeicherandYorick Peterse 2d154e54b6 Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master'
Fix an issue when filtering merge requests with more than one label

Fixes #15529.

See merge request !3886
2016-05-12 15:08:00 +02:00
Yorick Peterse 872a0934a3 Updated CHANGELOG for 8.7.5 2016-05-12 15:06:52 +02:00
Stan HuandYorick Peterse 70b630d230 Merge branch 'fix-build-notification-on-merge-page-change' into 'master'
Fix build notification on merge request page change even if the build status didn't change

## What does this MR do?
This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests.

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

## Why was this MR needed?
Because auf a bug introduced in !3998.

## What are the relevant issue numbers?
#17357

Closes #17357

See merge request !4086
2016-05-12 15:05:07 +02:00
Rémy CoutableandYorick Peterse e181dfc240 Merge branch '16568-relative-links-wiki-regression' into 'master'
Relative Links in the Wiki Are Broken

- [ ] #16568 (!4050) Relative links in wiki are broken
    - [x] Investigate issue

  
    - [x] Implementation / Fix

        - [x] Write (failing) tests for `WikiLinkFilter`
        - [x] Link to `./bar` should either get rewritten correctly or left alone
        - [x] Link to `./bar.md` should maybe get rewritten correctly (is left alone currently)
        - [x] Link to `bar.md` should get rewritten correctly


            - [x] Check if this indeed a bug

    - [x] Make sure CI is green
    - [x] Assign to endboss

    - [x] Wait for review

    - [x] Implement review feedback
    - [ ] Wait for merge


See merge request !4050
2016-05-12 15:03:49 +02:00
Yorick Peterse 6bc1e93afa Removed invalid CHANGELOG entry for 8.7.4
This MR never made it into 8.7.4.
2016-05-11 13:43:54 +02:00
Yorick Peterse f6fd70e746 Version 8.7.4 v8.7.4 2016-05-11 12:39:39 +02:00
Yorick Peterse 0c60640939 Fixed 8.7.4 CHANGELOG, again
[ci skip]
2016-05-11 12:32:13 +02:00
Yorick Peterse 8ec1dcf247 Revert "Merge branch 'fix-build-notification-on-merge-page-change' into 'master' "
This reverts commit d1ba098695.
2016-05-11 12:30:45 +02:00
Yorick Peterse 0dc34317f6 Corrected CHANGELOG entries for 8.7.4
[ci skip]
2016-05-11 12:24:34 +02:00
Yorick Peterse 8e5e3e5dd3 Added missing 8.7.4 CHANGELOG entries 2016-05-11 11:17:32 +02:00
Yorick Peterse 8e8e7969f7 Removed 8.8.0 CHANGELOG entries 2016-05-11 11:07:10 +02:00
Robert SpeicherandYorick Peterse 5ec4347067 Merge branch 'xss-case-insensitive-protocol' into 'master'
Use a case-insensitive check to compare URI schemes

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

See merge request !1965
2016-05-11 11:06:31 +02:00
Robert SpeicherandYorick Peterse 96461d4764 Merge branch 'cascade_drop' into 'master'
Add if exists to drop command

Add `IF EXISTS` as a precaution. Related to gitlab-org/gitlab-ce!4020

See merge request !4100
2016-05-11 11:06:09 +02:00
Robert SpeicherandYorick Peterse ca66610ed9 Merge branch 'cascade_drop' into 'master'
Rake drop tables with cascade

See merge request !4020
2016-05-11 11:05:58 +02:00
Stan HuandYorick Peterse d1ba098695 Merge branch 'fix-build-notification-on-merge-page-change' into 'master'
Fix build notification on merge request page change even if the build status didn't change

## What does this MR do?
This MR contains a bugfix for #17357 which was introduced by !3998. The notification are now only shown on status changes, and not when switching between different merge requests.

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

## Why was this MR needed?
Because auf a bug introduced in !3998.

## What are the relevant issue numbers?
#17357

Closes #17357

See merge request !4086
2016-05-11 11:01:05 +02:00
Robert SpeicherandYorick Peterse afcc33b797 Merge branch 'fix-link-to-redmine-issues' into 'master'
Allow Redmine issue references to work as intended

Closes #14527 and #14894 

See merge request !4048
2016-05-11 11:00:56 +02:00
Robert SpeicherandYorick Peterse d283e60d42 Merge branch 'signout-rel-url' into 'master'
Use sign out path only if not empty

Fixes: https://github.com/gitlabhq/gitlabhq/issues/10066

See merge request !3989
2016-05-11 11:00:22 +02:00
Rémy CoutableandYorick Peterse 0034e4f398 Merge branch 'trusted-proxies-ip-addr' into 'master'
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

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

See merge request !3970
2016-05-11 11:00:11 +02:00
Robert SpeicherandYorick Peterse fc8214ea83 Merge branch 'fix/import-url-issues' into 'master'
Fix importer bug when throwing exceptions

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

See merge request !3941
2016-05-11 11:00:01 +02:00
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