19859 Commits
Author SHA1 Message Date
Robert Speicher d8a9acdeee Version 8.1.0 v8.1.0 2015-10-22 10:00:53 +02:00
Robert Speicher 1019780555 Update CHANGELOG
[ci skip]
2015-10-22 09:56:06 +02:00
Valery SizovandRobert Speicher 6a81e51cb6 Merge branch 'fix-issue-3094' into 'master'
Don't show "Add README" link in an empty repository if user doesn't have access to push

Reporter users would see this before even though they didn't have access to push:

![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png)

It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After:

![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png)

Closes #3094

See merge request !1626
2015-10-22 09:22:32 +02:00
Robert SpeicherandRobert Speicher 843070b4aa Merge branch 'dm-issue-3140' into 'master'
Make sure MR refresh service correctly determines newly added commits.

Fixes #3140.

See merge request !1659
2015-10-22 09:16:28 +02:00
Robert SpeicherandRobert Speicher 357e07647f Merge branch 'fix-build-trace-updating' into 'master'
Fix build trace updating

Fixes #2910 

See merge request !1657
2015-10-22 09:10:28 +02:00
Robert SpeicherandRobert Speicher 8e65f91e67 Merge branch 'remove-ci-migration' into 'master'
Remove CI migration

See merge request !1656
2015-10-22 08:53:39 +02:00
Robert Speicher 62f6e8427d Version 8.1.0.rc2 v8.1.0.rc2 2015-10-21 11:15:34 +02:00
Dmitriy ZaporozhetsandRobert Speicher 3fc772615e Merge branch 'animated-logo' into 'master'
Animate the logo on hover

The logo is now rendered as pure SVG, rather than image referencing a
svg. The SVG has an id and the shapes of the logo have a shared class.
The shapes change their fill color on hover with a transition.

Identical to how it looks on about.gitlab.com

cc @skyruler

See merge request !1557
2015-10-21 10:32:20 +02:00
Robert SpeicherandRobert Speicher ab62efdb1a Merge branch 'markdown-tabs-margin' into 'master'
Fix margin around Markdown Write/Preview tabs.

Reverts !1354 and uses another fix for #2585.

See merge request !1654
2015-10-21 10:24:46 +02:00
Douwe MaanandRobert Speicher 250686265e Merge branch 'git-archive-improvements-2' into 'master'
Clear archive cache asynchronously



See merge request !1651
2015-10-21 10:19:07 +02:00
Robert Speicher 8180465e1a Update CHANGELOG
[ci skip]
2015-10-21 10:11:53 +02:00
Robert Speicher 6a78828b26 Update CHANGELOG
[ci skip]
2015-10-21 09:30:57 +02:00
Robert SpeicherandRobert Speicher e8d5582729 Merge branch 'fix-mysql-ci-limits-migration' into 'master'
Ensure MySQL CI limits DB migrations occur after the fields have been created

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

See merge request !1653
2015-10-21 09:30:04 +02:00
Robert SpeicherandRobert Speicher def48f0ad3 Merge branch 'add-missing-migrations' into 'master'
Add missing migrations

See merge request !1652
2015-10-21 09:04:14 +02:00
Dmitriy ZaporozhetsandRobert Speicher 595fc4d906 Merge branch 'handle-no-http-referer' into 'master'
Redirect to a default path if HTTP_REFERER is not set

Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode,
and it's possible load balancers/proxies strip the HTTP_REFERER from
the request header. In these cases, default to some default path.

Closes #3122

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

See merge request !1646
2015-10-20 18:38:33 +02:00
Douwe MaanandRobert Speicher acc1af5f0f Merge branch 'remove-duplicate-repos-in-github-import' into 'master'
Fix duplicate repositories in GitHub import page

By default, all the current user's repositories are accessible via the
/users endpoint. There's no need to traverse all the organization
repositories as well.

See:

* http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method
* https://developer.github.com/v3/repos/#list-your-repositories

Closes #2523

See merge request !1644
2015-10-20 18:30:57 +02:00
Dmitriy ZaporozhetsandRobert Speicher 44d35a8225 Merge branch 'merge-request-deleted-file' into 'master'
Correctly find last known blob for file deleted in MR.

Fixes #3092.

When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...".

See merge request !1647
2015-10-20 18:28:15 +02:00
Robert Speicher de27df7c65 Merge branch 'rs-8-1-update-guide-changes' into '8-1-stable'
Update 8.0-to-8.1 update guide

- User needs to update gitlab-git-http-server
- User needs to update Nginx configuration

[ci skip]

See merge request !1625
2015-10-20 16:09:11 +00:00
Robert Speicher 3f35d60bf4 Fetch before checkout
[ci skip]
2015-10-20 18:05:58 +02:00
Robert Speicher 3fbea8b349 Update CHANGELOG 2015-10-19 14:20:22 +02:00
Dmitriy ZaporozhetsandRobert Speicher d37a3a5721 Merge branch 'merge-request-widget' into 'master'
Fix missing commit status for widget when no CI service is enabled

Fix for #3082 

/cc @dzaporozhets 

See merge request !1621
2015-10-19 14:18:31 +02:00
Robert Speicher f2a6e876e2 Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button' 2015-10-19 14:17:33 +02:00
Robert SpeicherandRobert Speicher 955f424834 Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into 'master'
Send an email to admin email when a user is reported for spam

Replaces !1547.

Fixes #2839.

See merge request !1634
2015-10-19 14:07:34 +02:00
Robert SpeicherandRobert Speicher c4a20e61ba Merge branch 'index-milestone-title-label' into 'master'
Improve performance when filtering on milestone on labels

Also some minor refactoring in the seeding.

See merge request !1587
2015-10-19 13:52:49 +02:00
Robert SpeicherandRobert Speicher 592d1b3190 Merge branch 'notify-footer' into 'master'
Restore notification footer text

See merge request !1640
2015-10-19 12:56:33 +02:00
Dmitriy ZaporozhetsandRobert Speicher 06cb51340e Merge branch 'fix-code-leading-indent' into 'master'
Remove some padding from code blocks

This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else.

![Screen_Shot_2015-10-14_at_2.40.38_PM](https://gitlab.com/pioto/gitlab-ce/uploads/5434eb077c17e56528a94079afe3c732/Screen_Shot_2015-10-14_at_2.40.38_PM.png)


See merge request !1596
2015-10-19 12:31:09 +02:00
Stan HuandRobert Speicher bfc4403c80 Merge pull request #9744 from jamierocks/patch-1
Fix spelling of Description
2015-10-19 12:29:16 +02:00
Douwe MaanandRobert Speicher 0a156d5e74 Merge branch 'cross-reference-mr-on-issues' into 'master'
Show merge requests which close current issue

Closes #2903

### What does this MR do
If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue.

![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png)

/cc @DouweM

See merge request !1569
2015-10-19 12:10:19 +02:00
Robert SpeicherandRobert Speicher ba6583e0ce Merge branch 'close-issues-by-mr' into 'master'
Close issues mentioned in MR description when MR is merged using
fast-forward merge or when merge commit message is edited.

Fixes gitlab-org/gitlab-ee#48.

See merge request !1639
2015-10-19 11:33:17 +02:00
Robert SpeicherandRobert Speicher 5707aaf397 Merge branch 'hash-block-return' into 'master'
Fix bug where a push would only create cross references from the first commit.

Apparently we can't `return` from a `Hash.new` block. Who knew.

See merge request !1638
2015-10-19 11:19:26 +02:00
Yorick PeterseandRobert Speicher cc0978df41 Merge branch 'friday-meltdown-indexes' into 'master'
See merge request !1623
2015-10-17 17:47:27 -04:00
Dmitriy ZaporozhetsandRobert Speicher b6d1bcb076 Merge branch 'hide-builds-tab' into 'master'
Hide Builds tab is GitLab CI is not enabled

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

See merge request !1627
2015-10-17 17:45:35 -04:00
Dmitriy ZaporozhetsandRobert Speicher 84f288c7c5 Merge branch 'redirect-ci-page' into 'master'
Redirect old CI project route to GitLab project

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

See merge request !1629
2015-10-17 17:44:25 -04:00
Dmitriy ZaporozhetsandRobert Speicher c956ecd9cc Merge branch 'outdated-discussion-padding' into 'master'
Fix padding of outdated discussion item.

Old:

![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png)

New:

![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png)

It still looks the same when the discussion is expanded.

See merge request !1614
2015-10-17 17:41:58 -04:00
Dmitriy ZaporozhetsandRobert Speicher 73547ae613 Merge branch 'redirect-ci-dash' into 'master'
Temporary bring /ci page page with help information

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

See merge request !1630
2015-10-17 17:40:33 -04:00
Douwe Maan d80a4d3c15 Merge branch 'rs-redactor-filter' into 'master'
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects

Related: !1014

See merge request !1090
2015-10-17 13:57:22 +02:00
Robert SpeicherandRobert Speicher f4d3639a0d Merge branch 'filter-label' into 'master'
Allow dashboard and group issues/MRs to be filtered by label

See merge request !1591
2015-10-16 17:31:38 -04:00
Drew BlessingandRobert Speicher e047e13a79 Fix import from SVN link 2015-10-16 17:18:36 -04:00
Robert Speicher e049390f42 Re-add Nginx configuration to 8.0-to-8.1 update guide 2015-10-16 17:08:09 -04:00
Robert Speicher d5b083e0f3 Add "Update gitlab-git-http-server" section to 8.0-to-8.1 update guide
[ci skip]
2015-10-16 17:02:57 -04:00
Robert SpeicherandRobert Speicher 64edacd9f6 Merge branch 'gghs-0.3.0' into 'master'
Use gitlab-git-http-server 0.3.0 for GitLab 8.1

See merge request !1605
2015-10-16 16:16:59 -04:00
Robert SpeicherandRobert Speicher c3f5cc5367 Merge branch 'gitlab-git-http-server-version' into 'master'
Track compatible gitlab-git-http-server version

The 'git archive' changes in GitLab 8.1 require a version of
gitlab-git-http-server that is incompatible with GitLab 8.0, so we
need to keep track of this now.

See merge request !1603
2015-10-16 16:16:56 -04:00
Dmitriy ZaporozhetsandRobert Speicher 10d64038e3 Merge branch 'improve-typography' into 'master'
Improve typography



See merge request !1622
2015-10-16 16:12:15 -04:00
Dmitriy ZaporozhetsandRobert Speicher 4a3f0f9517 Merge branch 'fix-wiki-padding' into 'master'
Dont put padding on typography but on holder elements instead

Fixes wrong padding of wiki content.

See merge request !1620
2015-10-16 16:11:40 -04:00
Dmitriy ZaporozhetsandRobert Speicher 201d265b47 Merge branch 'compact-select' into 'master'
Make selectbox options more compact

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

See merge request !1619
2015-10-16 16:09:05 -04:00
Dmitriy ZaporozhetsandRobert Speicher d4a20a6aa8 Merge branch 'comment-highlight' into 'master'
Highlight comment based on anchor in URL

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

Fix for #2954 

See merge request !1618
2015-10-16 16:08:49 -04:00
Yorick PeterseandRobert Speicher 3234e800a0 Merge branch 'ci-commits-gl-project-id-index' into 'master'
Add index on ci_commits.gl_project_id



See merge request !1616
2015-10-16 16:05:53 -04:00
Ashley HindleandRobert Speicher 13931ec577 Changed loose to lose 2015-10-16 16:04:54 -04:00
Douwe MaanandRobert Speicher fd2d295b6b Merge branch 'notify-mr-upon-branch-presence-change' into 'master'
Add a system note and update relevant merge requests when a branch is deleted or re-added

If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

The new messages look like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6581eea069cd8e485b7fa4187ed4c043/image.png)

Closes #2926 

See merge request !1601
2015-10-16 16:03:48 -04:00
Robert Speicher bc0ee41a27 Version 8.1.0.rc1 v8.1.0.rc1 2015-10-16 00:15:44 -04:00