summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 8.1.0.rc2v8.1.0.rc2Robert Speicher2015-10-211-1/+1
|
* Merge branch 'animated-logo' into 'master'Dmitriy Zaporozhets2015-10-215-10/+49
| | | | | | | | | | | | | | 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
* Merge branch 'markdown-tabs-margin' into 'master' Robert Speicher2015-10-211-4/+1
| | | | | | | Fix margin around Markdown Write/Preview tabs. Reverts !1354 and uses another fix for #2585. See merge request !1654
* Merge branch 'git-archive-improvements-2' into 'master' Douwe Maan2015-10-216-53/+20
| | | | | | | Clear archive cache asynchronously See merge request !1651
* Update CHANGELOGRobert Speicher2015-10-211-9/+1
| | | | [ci skip]
* Update CHANGELOGRobert Speicher2015-10-211-2/+2
| | | | [ci skip]
* Merge branch 'fix-mysql-ci-limits-migration' into 'master' Robert Speicher2015-10-213-4/+11
| | | | | | | 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
* Merge branch 'add-missing-migrations' into 'master' Robert Speicher2015-10-214-1/+17
| | | | | Add missing migrations See merge request !1652
* Merge branch 'handle-no-http-referer' into 'master' Dmitriy Zaporozhets2015-10-2020-43/+133
| | | | | | | | | | | | | 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
* Merge branch 'remove-duplicate-repos-in-github-import' into 'master' Douwe Maan2015-10-203-5/+9
| | | | | | | | | | | | | | | | 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
* Merge branch 'merge-request-deleted-file' into 'master' Dmitriy Zaporozhets2015-10-209-19/+38
| | | | | | | | | 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
* Merge branch 'rs-8-1-update-guide-changes' into '8-1-stable' Robert Speicher2015-10-201-4/+34
|\ | | | | | | | | | | | | | | | | | | 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
| * Fetch before checkoutRobert Speicher2015-10-201-0/+1
| | | | | | | | [ci skip]
| * Re-add Nginx configuration to 8.0-to-8.1 update guiders-8-1-update-guide-changesRobert Speicher2015-10-161-0/+21
| |
| * Add "Update gitlab-git-http-server" section to 8.0-to-8.1 update guideRobert Speicher2015-10-161-4/+12
| | | | | | | | [ci skip]
* | Update CHANGELOGRobert Speicher2015-10-191-4/+0
| |
* | Merge branch 'merge-request-widget' into 'master' Dmitriy Zaporozhets2015-10-191-37/+36
| | | | | | | | | | | | | | | | | | Fix missing commit status for widget when no CI service is enabled Fix for #3082 /cc @dzaporozhets See merge request !1621
* | Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-194-16/+23
| |
* | Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into ↵Robert Speicher2015-10-1911-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | 'master' Send an email to admin email when a user is reported for spam Replaces !1547. Fixes #2839. See merge request !1634
* | Merge branch 'index-milestone-title-label' into 'master' Robert Speicher2015-10-196-48/+77
| | | | | | | | | | | | | | Improve performance when filtering on milestone on labels Also some minor refactoring in the seeding. See merge request !1587
* | Merge branch 'notify-footer' into 'master' Robert Speicher2015-10-191-0/+4
| | | | | | | | | | Restore notification footer text See merge request !1640
* | Merge branch 'fix-code-leading-indent' into 'master' Dmitriy Zaporozhets2015-10-191-1/+0
| | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #9744 from jamierocks/patch-1Stan Hu2015-10-191-1/+1
| | | | | | Fix spelling of Description
* | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-1913-7/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'close-issues-by-mr' into 'master' Robert Speicher2015-10-192-0/+12
| | | | | | | | | | | | | | | | 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
* | Merge branch 'hash-block-return' into 'master' Robert Speicher2015-10-192-2/+2
| | | | | | | | | | | | | | 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
* | Merge branch 'friday-meltdown-indexes' into 'master' Yorick Peterse2015-10-173-1/+21
| | | | | | See merge request !1623
* | Merge branch 'hide-builds-tab' into 'master' Dmitriy Zaporozhets2015-10-171-1/+1
| | | | | | | | | | | | | | Hide Builds tab is GitLab CI is not enabled Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1627
* | Merge branch 'redirect-ci-page' into 'master' Dmitriy Zaporozhets2015-10-171-0/+5
| | | | | | | | | | | | | | Redirect old CI project route to GitLab project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1629
* | Merge branch 'outdated-discussion-padding' into 'master' Dmitriy Zaporozhets2015-10-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'redirect-ci-dash' into 'master' Dmitriy Zaporozhets2015-10-172-3/+23
| | | | | | | | | | | | | | Temporary bring /ci page page with help information Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1630
* | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-1744-476/+810
| | | | | | | | | | | | | | 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
* | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-167-25/+55
| | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
* | Fix import from SVN linkDrew Blessing2015-10-161-1/+1
|/
* Merge branch 'gghs-0.3.0' into 'master' Robert Speicher2015-10-162-2/+2
| | | | | Use gitlab-git-http-server 0.3.0 for GitLab 8.1 See merge request !1605
* Merge branch 'gitlab-git-http-server-version' into 'master' Robert Speicher2015-10-163-0/+3
| | | | | | | | | 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
* Merge branch 'improve-typography' into 'master' Dmitriy Zaporozhets2015-10-161-41/+35
| | | | | | | Improve typography See merge request !1622
* Merge branch 'fix-wiki-padding' into 'master'Dmitriy Zaporozhets2015-10-163-2/+8
| | | | | | | | Dont put padding on typography but on holder elements instead Fixes wrong padding of wiki content. See merge request !1620
* Merge branch 'compact-select' into 'master' Dmitriy Zaporozhets2015-10-161-2/+2
| | | | | | | Make selectbox options more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1619
* Merge branch 'comment-highlight' into 'master' Dmitriy Zaporozhets2015-10-162-0/+8
| | | | | | | | | Highlight comment based on anchor in URL Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fix for #2954 See merge request !1618
* Merge branch 'ci-commits-gl-project-id-index' into 'master' Yorick Peterse2015-10-162-1/+7
| | | | | | | Add index on ci_commits.gl_project_id See merge request !1616
* Changed loose to loseAshley Hindle2015-10-161-1/+1
|
* Merge branch 'notify-mr-upon-branch-presence-change' into 'master' Douwe Maan2015-10-169-19/+127
| | | | | | | | | | | | | | | | 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
* Version 8.1.0.rc1v8.1.0.rc1Robert Speicher2015-10-161-1/+1
|
* Merge branch 'when-syntax' into 'master' Robert Speicher2015-10-1610-126/+283
|\ | | | | | | | | Implement when syntax in .gitlab-ci.yml See merge request !1606
| * Correct spec description typoRobert Speicher2015-10-151-1/+1
| | | | | | | | [ci skip]
| * Update CI YAML docswhen-syntaxRobert Speicher2015-10-151-4/+5
| |
| * Shut up, RubocopRobert Speicher2015-10-151-1/+1
| |
| * Backticks around when typesKamil Trzcinski2015-10-151-1/+1
| |
| * Fix specsKamil Trzcinski2015-10-153-5/+6
| |