home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,876 Commits 48 Branches 340 Tags
eea8a6d0620e47fb4c009eefb73fa100fa2ba3e8
Commit Graph
19876 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert SpeicherandRobert Speicher eea8a6d062 Merge branch 'remove-satellites' into 'master' 
Add migration to remove the contents of the satellites dir

See merge request !1681
 2015-10-26 11:41:10 +01:00
Stan HuandRobert Speicher 21854582ed Merge pull request #9749 from Bufallo/fix-redis-check 
Fix regex in redis version check
 2015-10-26 09:34:36 +01:00
Robert Speicher b539128400 Remove "install schedules" step from Installation guide 
[ci skip]
 2015-10-24 15:53:24 +02:00
Kamil Trzcinski 4467c425bc Merge branch 'fix-ci-regressions' into 8-1-stable 2015-10-23 16:26:53 +02:00
Kamil Trzcinski 940a7fc106 Fail builds that also have empty string 2015-10-23 16:25:23 +02:00
Kamil Trzcinski e0eb51e945 Fix broken Runners admin page 2015-10-23 16:25:23 +02:00
Kamil Trzcinski 74c02827bc On CI Admin page show only projects that are present in GitLab 2015-10-23 16:25:23 +02:00
Kamil Trzcinski 6b7d01d9ff Allow developer to manage builds 2015-10-23 16:25:22 +02:00
Kamil Trzcinski f855755999 Fix small CI UI regressions 2015-10-23 16:25:21 +02:00
Robert SpeicherandRobert Speicher 7121834535 Merge branch 'fix-wiki-clone-over-http' into 'master' 
Fix cloning Wiki repositories via HTTP

Cloning a project Wiki over HTTP would end up cloning the main repository
since the .wiki extension was being stripped.

Closes #3106

See merge request !1676
 2015-10-23 13:32:48 +02:00
Robert Speicher 6721215fa9 Merge branch '8-1-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-1-stable 2015-10-22 17:53:17 +02:00
Robert Speicher e913ab737c Merge branch 'fix-edit-readme' into '8-1-stable' 
Fix edit readme link on project home page

See merge request !1668
 2015-10-22 15:51:41 +00:00
Dmitriy Zaporozhets 6b9b829849 Fix edit readme link on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-22 16:28:46 +02:00
Robert SpeicherandRobert Speicher 8fe4352eba Merge branch 'project-path-case-sensitivity' into 'master' 
Prefer project with exact path to differently cased one when both exist.

Fixes #3113.

See merge request !1649
 2015-10-22 15:05:54 +02:00
Robert SpeicherandRobert Speicher 613f368ce5 Merge branch 'fix-ci-services-editing' into 'master' 
Fix 500 when editing CI services

Fixes #3090

See merge request !1663
 2015-10-22 14:04:30 +02:00
Robert SpeicherandRobert Speicher 00244a8969 Merge branch 'fail-on-empty-job-name' into 'master' 
Require jobs to be named

This properly presents error for .gitlab-ci.yml having empty job name.

See merge request !1662
 2015-10-22 14:00:05 +02:00
Robert SpeicherandRobert Speicher 60e82ef857 Merge branch 'fix-css-for-runner' into 'master' 
Fix CSS class for runner status

Fixes #3117 

See merge request !1665
 2015-10-22 13:44:56 +02:00
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