home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,063 Commits 48 Branches 340 Tags
9f2e1f504df2fa9ef7d658cbc73bbdba6f897eda
Commit Graph
9949 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9f2e1f504d Refactor git follow option set 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 14:39:27 +02:00
Dmitriy Zaporozhets 03ea0c74af Use git follow flag for commits page when retrieve history for file or directory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 13:13:22 +02:00
Dmitriy Zaporozhets 7f5acdb20a Merge branch 'update-fonts' into 'master' 
Update SourceSansPro fonts

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

See merge request !1678
 2015-10-23 10:54:46 +00:00
Dmitriy Zaporozhets 3bb39f0e49 Merge branch 'comments_fix' into 'master' 
Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork

https://dev.gitlab.org/gitlab/gitlabhq/issues/2535

See merge request !1675
 2015-10-23 09:46:18 +00:00
Dmitriy Zaporozhets a7174efaec Merge branch 'readme-extra-padding' into 'master' 
Add extra padding to README block

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

cc @skyruler 

See merge request !1671
 2015-10-22 17:08:04 +00:00
Valery Sizov 95df86638d Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork 2015-10-22 18:38:00 +02:00
Dmitriy Zaporozhets 1d6358d360 Merge branch 'cleanup-css' into 'master' 
Improve css code quality for projects.scss

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

See merge request !1674
 2015-10-22 16:20:43 +00:00
Dmitriy Zaporozhets f61dd16c3f Improve css code quality for projects.scss 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-22 17:58:09 +02:00
Dmitriy Zaporozhets 65663d64bc Merge branch 'rs-issuable-filter-count-style' into 'master' 
Fix alignment of the filter counter for Issuables

## Before:

![Screen_Shot_2015-10-22_at_4.00.15_PM](/uploads/5f54faf3b056c1b3e2cb1b6d5c27614b/Screen_Shot_2015-10-22_at_4.00.15_PM.png)

## After:

![Screen_Shot_2015-10-22_at_3.58.04_PM](/uploads/127a90795aed7d41c053a735bbee0e3b/Screen_Shot_2015-10-22_at_3.58.04_PM.png)


See merge request !1667
 2015-10-22 15:44:34 +00:00
Dmitriy Zaporozhets ddb984470d Add extra padding to README block 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-22 17:33:51 +02:00
Dmitriy Zaporozhets 8655f4793e Remove bad css style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-22 17:25:06 +02:00
Dmitriy Zaporozhets c83da87511 Merge branch 'compact-file-list' into 'master' 
Make file list more compact

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

See merge request !1669
 2015-10-22 15:22:17 +00:00
Dmitriy Zaporozhets c2db73b699 Merge branch 'project-readme-edit' into 'master' 
Restore edit button in project readme

Also make sure edit button can actually be clicked, like !1668.

See merge request !1670
 2015-10-22 15:21:34 +00:00
Douwe Maan 097238f0a5 Restore edit button in project readme 2015-10-22 17:11:21 +02:00
Dmitriy Zaporozhets 2db7868a55 Make file list more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-22 16:50:21 +02:00
Robert Speicher 5f1c99b757 Fix alignment of the filter counter for Issuables 2015-10-22 16:12:11 +02:00
Dmitriy Zaporozhets 01315cfe76 Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master' 
Update style of snippets pages

![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png)

![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png)

Replaces !1567.

Fixes #1767 and #2538.


See merge request !1637
 2015-10-22 13:34:34 +00:00
Robert Speicher 7924dd5c9f 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 13:03:04 +00:00
Robert Speicher b97977afef Merge branch 'fix-ci-services-editing' into 'master' 
Fix 500 when editing CI services

Fixes #3090

See merge request !1663
 2015-10-22 12:03:20 +00:00
Kamil Trzcinski 337b6632b6 Fix CSS class for runner status 2015-10-22 11:31:44 +02:00
Kamil Trzcinski 40934ae39b Fix 500 when editing CI services 2015-10-22 11:14:15 +02:00
Douwe Maan c7c5bd4843 Change dashboard snippet index menu class to match test 2015-10-22 10:46:54 +02:00
Douwe Maan 8b127f4526 Merge branch 'bozaro-empty-repo' 2015-10-22 10:25:57 +02:00
Robert Speicher ada2d23116 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 07:15:56 +00:00
Robert Speicher 7c0d2d329e Merge branch 'fix-build-trace-updating' into 'master' 
Fix build trace updating

Fixes #2910 

See merge request !1657
 2015-10-22 07:09:48 +00:00
Valery Sizov f810fab705 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 06:56:35 +00:00
Douwe Maan 464c939a7e Clean up MR refresh service somewhat. 2015-10-21 17:34:12 +02:00
Douwe Maan 9c61b73c21 Make sure MR refresh service correctly determines newly added commits. 2015-10-21 17:24:09 +02:00
Stan Hu 4eac37fd87 Don't show "Add README" link in an empty repository if user doesn't have access to push 
Closes #3094
 2015-10-21 07:33:14 -07:00
Artem V. Navrotskiy c192444db5 Show empty repository page if repository don't have branches 2015-10-21 13:53:07 +03:00
Kamil Trzcinski c21d46c29f Fix build trace updating 2015-10-21 12:34:25 +02:00
Dmitriy Zaporozhets 0179d5df18 Update SourceSansPro fonts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-21 12:15:39 +02:00
Douwe Maan de9886bece Restyle dashboard snippets visibility level tabs. 2015-10-21 11:10:09 +02:00
Douwe Maan d37cf64237 Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-show 2015-10-21 10:24:06 +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
Douwe Maan e17e5a5ce4 Move case sensitivity check to find_with_namespace. 2015-10-21 10:09:32 +02: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
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
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
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
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
Douwe Maan 2f7fc7e9f7 Prefer project with exact path to differently cased one when both exist. 2015-10-20 16:16:08 +02:00