home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,974 Commits 48 Branches 340 Tags
8052c4ef4e23ea4f4a221fbc6ead138f33fb0f91
Commit Graph
19974 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert SpeicherandRobert Speicher 8052c4ef4e Merge branch 'rs-8-1-update-guide-changes' into 'master' 
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 18:11:38 +02:00
Stan Hu cff470a30d Merge pull request #9750 from Bufallo/simplify-patch-updates 
Simplify patch version updates (less steps)
 2015-10-20 08:47:09 -07:00
Stan Hu befff6827a Merge pull request #9732 from MauriceMohlek/patch-1 
Update CHANGELOG
 2015-10-20 07:56:49 -07:00
Douwe Maan 97eafd4b3d 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 10:51:49 +00:00
Maurice Mohlek b0a3ece265 Fix order 2015-10-20 09:44:13 +02:00
Maurice Mohlek ffacb01be2 Update CHANGELOG 2015-10-20 09:40:21 +02:00
Benny Schimmer 8479feeba2 Simplify patch version updates (less steps) 2015-10-20 00:41:42 +02:00
Stan Hu 1f1b3a0942 Merge pull request #9749 from Bufallo/fix-redis-check 
Fix regex in redis version check
 2015-10-19 14:25:02 -07:00
Benny Schimmer d02a467d64 Fix regex in redis version check 2015-10-19 22:14:22 +02:00
Stan Hu 4ad64ab3f4 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
 2015-10-19 10:39:59 -07:00
Robert Speicher 87d710f5a5 Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button' 2015-10-19 14:13:43 +02:00
Robert Speicher ba41b2ba43 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 12:06:13 +00:00
Dmitriy Zaporozhets e965598604 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 11:58:48 +00:00
Douwe Maan f9cd0639c1 Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button 
[ci skip]
 2015-10-19 13:49:52 +02:00
Robert Speicher f7140dcc63 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 11:49:31 +00:00
Douwe Maan 47194545c7 Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify 
[ci skip]
 2015-10-19 13:48:52 +02:00
Robert Speicher 904c11ef91 Merge branch 'notify-footer' into 'master' 
Restore notification footer text

See merge request !1640
 2015-10-19 10:54:37 +00:00
Dmitriy Zaporozhets 3104adbbfd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-19 12:54:09 +02:00
Dmitriy Zaporozhets 4a94084dde Merge branch 'add-files-optionto-changelog' 2015-10-19 12:53:53 +02:00
Dmitriy Zaporozhets 42bf98effa 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 10:28:21 +00:00
Dmitriy Zaporozhets df39ba9dec Merge branch 'user-page-new-ui' into 'master' 
Implement new UI for user page. Part 1

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

See merge request !1615
 2015-10-19 09:47:49 +00:00
Douwe Maan 8b8fbd4e7f Rename confusing methods 2015-10-19 11:46:22 +02:00
Douwe Maan 157d891615 Add changelog item 2015-10-19 11:40:13 +02:00
Yorick Peterse 1354786048 Merge branch 'milestone-issue-sorting-performance' into 'master' 
Improve performance of sorting milestone issues

This will fix the problem described in #3066.

See merge request !1609
 2015-10-19 09:38:06 +00:00
Yorick Peterse 4ff75e3179 Improve performance of sorting milestone issues 
This cuts down the time it takes to sort issues of a milestone by about
10x. In the previous setup the code would run a SQL query for every
issue that had to be sorted. The new setup instead runs a single SQL
query to update all the given issues at once.

The attached benchmark used to run at around 60 iterations per second,
using the new setup this hovers around 600 iterations per second. Timing
wise a request to update a milestone with 40-something issues would take
about 760 ms, in the new setup this only takes about 130 ms.

Fixes #3066
 2015-10-19 11:37:14 +02:00
Douwe Maan 8adeda37b5 Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'master' 
Add ability to remove the fork relationship from project settings

![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png)
![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png)

Replaces !1579.

Fixes #2578.

See merge request !1636
 2015-10-19 09:32:07 +00:00
Robert Speicher c9edffcba6 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 09:31:11 +00:00
Dmitriy Zaporozhets a148c06cf8 Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' 
Allow users to select the Files view as default project view


![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png)

Also shows the readme at the very bottom, like on the regular Files page.


Replaces !1489.

Closes #2655.

See merge request !1632
 2015-10-19 09:27:37 +00:00
Douwe Maan 6ad78d3ab1 Move changelog item to 8.2 
[ci skip]
 2015-10-19 11:25:21 +02:00
Robert Speicher 5292b09f95 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 09:16:20 +00:00
Stan Hu b9a149bc0b Merge pull request #9744 from jamierocks/patch-1 
Fix spelling of Description
 2015-10-18 10:18:58 -07:00
Jamie Mansfield 405a10e9b8 Fix spelling of Description 2015-10-18 17:42:18 +01:00
Douwe Maan 85264ab6a9 Restore notification footer text. 2015-10-18 15:24:04 +02:00
Douwe Maan d12e49c591 Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge. 2015-10-18 15:07:02 +02:00
Douwe Maan aafb36616c Fix schema 
[ci skip]
 2015-10-18 14:26:25 +02:00
Douwe Maan f3a74556b1 Fix spec 2015-10-18 14:12:50 +02:00
Douwe Maan 41615ddde4 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-18 12:07:28 +00:00
Douwe Maan cc2b05adf8 Fix bug where a push would only create cross references from the first commit. 2015-10-18 14:05:27 +02:00
Douwe Maan a62bd12117 Merge branch 'master' into zj/gitlab-ce-index-milestone-title-label 2015-10-18 13:12:10 +02:00
Douwe Maan 2e2a2a366f Satisfy Rubocop 2015-10-18 13:08:08 +02:00
Douwe Maan 42cbc7f813 Tweak wording. 2015-10-18 12:38:01 +02:00
Douwe Maan ef9284636c Add changelog item 2015-10-18 12:21:28 +02:00
Douwe Maan eeea6ef25f Sentences end in periods. 2015-10-18 12:19:42 +02:00
Douwe Maan 1195ecd198 Add tooltip. 2015-10-18 12:19:36 +02:00
Douwe Maan 99b8568ff7 Find correct group membership. 2015-10-18 12:19:30 +02:00
Douwe Maan 5c4bb6df0d Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button 2015-10-18 12:18:35 +02:00
Douwe Maan 024b6fa11a Add changelog item 2015-10-18 12:06:47 +02:00
Douwe Maan 7ccfbcccef Add help text to admin settings notification email. 2015-10-18 11:59:07 +02:00
Douwe Maan 551512b147 Validate admin notification email. 2015-10-18 11:58:59 +02:00
Douwe Maan 3b1c702572 Fix spec. 2015-10-18 11:58:53 +02:00