home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,010 Commits 48 Branches 340 Tags
abbca6151d66ebc227c883af35cd01cf4d7e24eb
Commit Graph
20010 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan abbca6151d Make pipelines actually make sense 2015-10-21 12:32:30 +02:00
Douwe Maan de0acf3cf7 Merge branch 'master' into reference-pipeline-and-caching 2015-10-21 11:36:41 +02:00
Robert Speicher d25b50fda6 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 08:22:56 +00:00
Dmitriy Zaporozhets c93bc72834 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 08:21:46 +00:00
Dmitriy Zaporozhets 5f045df762 Merge branch 'full-width-tables' into 'master' 
Make tables full width.

## Before

![Screen_Shot_2015-10-19_at_11.17.32](/uploads/acea66825b41006a949b5cc31cc07699/Screen_Shot_2015-10-19_at_11.17.32.png)

## After

![Screen_Shot_2015-10-19_at_11.19.16](/uploads/ed61e5e6cafe06c5e2d75672f5585c93/Screen_Shot_2015-10-19_at_11.19.16.png)


See merge request !1642
 2015-10-21 08:16:27 +00:00
Douwe Maan ab1b4936f4 Fix margin around Markdown Write/Preview tabs. 2015-10-21 10:15:13 +02:00
Robert Speicher 35618a3dff 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 07:27:49 +00:00
Douwe Maan 9769a8704c Merge branch 'git-archive-improvements-2' into 'master' 
Clear archive cache asynchronously



See merge request !1651
 2015-10-21 07:27:01 +00:00
Stan Hu e39fdc1ddd Ensure MySQL CI limits DB migrations occur after the fields have been created 
Closes https://github.com/gitlabhq/gitlabhq/issues/9753
 2015-10-21 00:11:06 -07:00
Robert Speicher 6f5a844edc Merge branch 'add-missing-migrations' into 'master' 
Add missing migrations

See merge request !1652
 2015-10-21 07:03:04 +00:00
Job van der Voort 2a28b21054 the logo svg should not mess with replacement imgs 2015-10-21 08:59:30 +02:00
Job van der Voort dd0552c36d 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.
 2015-10-21 08:59:30 +02:00
Douwe Maan 0f2b10c69f Fix duplication between tree_header and tree_content 2015-10-21 08:41:53 +02:00
Douwe Maan d222ce8b34 Merge branch 'master' into full-width-tables 2015-10-21 08:39:19 +02:00
Kamil Trzcinski f9f6724f55 Added extra index for faster enumeration of CI builds 2015-10-20 19:41:45 +02:00
Kamil Trzcinski 8f4ae40e3c Add missing migrations 2015-10-20 19:24:41 +02:00
Dmitriy Zaporozhets 249a9476d4 Merge branch 'reference-filter-replace-text-nodes-performance' into 'master' 
Speed up searching for text references a bit



See merge request !1648
 2015-10-20 16:26:53 +00:00
Dmitriy Zaporozhets f16bfa401f 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 16:24:01 +00:00
Dmitriy Zaporozhets d01fb5d81b 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 16:19:39 +00:00
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
Jacob Vosmaer e4008bc415 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2 2015-10-20 17:12:23 +02:00
Jacob Vosmaer a321404fde Remove unused sidekiq worker 2015-10-20 17:11:31 +02:00
Stan Hu befff6827a Merge pull request #9732 from MauriceMohlek/patch-1 
Update CHANGELOG
 2015-10-20 07:56:49 -07:00
Jacob Vosmaer e1fff018d7 Clear archive cache asynchronously 2015-10-20 16:53:37 +02:00
Stan Hu 9bfc531ec6 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
 2015-10-20 07:45:48 -07:00
Yorick Peterse e1c3077e4b Added benchmark for ReferenceFilter 2015-10-20 15:53:22 +02:00
Yorick Peterse afdc028516 Speed up searching for text references a bit 
If a node is ignored there's no need for searching for a given pattern.
In turn, when searching for the pattern there's no need to construct a
MatchData object as we only care about presence (or lack thereof), not
the resulting matches.

In terms of performance this cuts down about 200 ms when loading
issue #2164 locally, though this varies a bit depending on system load.
 2015-10-20 15:52:40 +02:00
Douwe Maan 8710739e4e Correctly find last known blob for file deleted in MR. 2015-10-20 14:24:02 +02: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