home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,136 Commits 48 Branches 340 Tags
0ea38dc519b86d2bd2e14f1df1baf0fffc043af6
Commit Graph
9984 Commits
Author SHA1 Message Date
Douwe Maan 0ea38dc519 Merge branch 'binford2k/gitlab-ce-feature/create_new_directories' 2015-10-29 15:50:49 +01:00
Ben FordandDouwe Maan 3be9d2c422 Add ability to create directories in the editor 
Simply type a name with a `/` directory separator and new directories
will be created. This does not do the fancy UI work that github.com
does, but it will get the job done.

I could not find tests for file creation, so I didn't add a test for
this slight behaviour modification. I did test directory traversals
though, using both absolute paths like `/tmp/foo.txt` and relative paths
like `../../foo.txt`. Neither case escaped the repository, though
attempting to traverse with a relative path resulted in a 500 error that
did not affect application stability upon reload.
 2015-10-29 15:49:07 +01:00
Stan Hu f56c7d9f8e Force update refs/merge-requests/X/head upon a push to the source branch of a merge request 
Closes #3138
 2015-10-29 00:10:25 +01:00
Dmitriy Zaporozhets f9c929b313 Merge branch 'edit-new-cross-references' 2015-10-28 14:57:17 +01:00
Douwe Maan aaa93d5add Use issue editor as cross reference comment author when issue is edited with a new mention. 2015-10-28 13:09:51 +01:00
Dmitriy Zaporozhets c9af886df9 Remove deprecated CI events from project settings page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-28 12:33:54 +01:00
Stan Hu 98cc695afb Merge pull request #9771 from kazubu/fix_error_destroy_without_referer 
Fix: 500 error returned if destroy request without HTTP referer
 2015-10-26 16:49:14 +01:00
Robert Speicher 2b1636a320 Merge branch 'fix-ci-badge' into 'master' 
Fix CI badge

The previous code relied on having on ref stored in commit, however the ref was moved to the build.

Fixes #3104

See merge request !1690
 2015-10-26 14:02:21 +00:00
Kamil Trzcinski 271ad4e354 Fix CI badge 
The previous code relied on having on ref stored in commit, however the ref was moved to the build.
 2015-10-26 12:23:40 +01:00
Kamil Trzcinski 6db014987d Fix specific runner visibility 2015-10-26 11:23:11 +01:00
kazubu 0bfb9cbf38 modify to use redirect_back_or_default function 2015-10-26 15:06:55 +09:00
kazubu c3d48f9735 Fix: 500 error returned if destroy request without HTTP referer 2015-10-26 15:06:55 +09:00
Stan Hu f66ec1bc81 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-26 06:30:57 +01:00
Douwe Maan b6f8d0100e Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses' 2015-10-25 11:55:14 +01:00
Dmitriy Zaporozhets 9b93704614 Merge branch 'ci-status-mr-index' into 'master' 
Ci status for merge requests index page

![ci-mr-index](/uploads/1424564c87ac6ff5fb2c4bc260fbebdf/ci-mr-index.png)


See merge request !1682
 2015-10-25 09:14:48 +00:00
Jannick Fahlbusch 45399ccc9a Fix some grammatical issues 2015-10-24 12:37:44 +02:00
Jannick Fahlbusch 7e441bbb40 Add missing character 
This adds the missing character `a` to the help-text
 2015-10-23 23:37:28 +02:00
Dmitriy Zaporozhets 5615f2737c Fix rubocop issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 18:21:43 +02:00
Dmitriy Zaporozhets 696a708401 Move rendering CI status to helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 17:32:52 +02:00
Dmitriy Zaporozhets 7b06c83cf7 Add tests for MR index page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 17:01:25 +02:00
Dmitriy Zaporozhets fe6ec80e75 Render CI status on merge requests index page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 17:01:10 +02:00
Dmitriy Zaporozhets 0bb50ea081 Merge branch 'rs-clipboard-js' into 'master' 
Add "Copy to clipboard" buttons

See #2855

See merge request !1494
 2015-10-23 14:39:03 +00:00
Dmitriy Zaporozhets 61fcb3c568 Merge branch 'git-follow' into 'master' 
Use git follow flag for commits page when retrieve history for file or directory

This can be really helpful when you want commit history for file that was moved recently

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

See merge request !1680
 2015-10-23 14:29:34 +00:00
Robert Speicher 17c60173f6 Merge branch 'fix-ci-regressions' into 'master' 
Fix CI regressions

This MR fixes a couple of small CI regressions
- Allow developer to manage builds
- On CI Admin page show only projects that are present in GitLab
- On Runner CI Admin page show only projects that are present in GitLab
- Refresh build log only when status changes
- Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top
- Fix Lint rendering
- Fix number of other builds in build widget

Fixes #3164

Fixes #3161 

Fixes gitlab-org/gitlab-ci#343

See merge request !1679
 2015-10-23 14:06:34 +00:00
Robert Speicher 03cfda9422 Remove unused argument from clipboard_button helper 2015-10-23 15:59:25 +02:00
Robert Speicher 8010872579 Add clipboard buttons to each step of "How to merge" 2015-10-23 15:44:39 +02:00
Robert Speicher 187625831f Add "Copy to clipboard" buttons 
Adds buttons to the commit list SHAs and the cross-project reference
data on issuables.
 2015-10-23 15:31:43 +02:00
Robert Speicher 831deeeac3 Add styling for cross-project-reference clipboard button 2015-10-23 15:29:53 +02:00
Robert Speicher c05275a201 Add copy_to_clipboard JS 2015-10-23 15:29:09 +02:00
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
Kamil Trzcinski 5921a1edf3 Fixed nesting for Allowed to fail 2015-10-23 13:37:37 +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
Kamil Trzcinski 2afb2d3c67 Fix broken Runners admin page 2015-10-23 12:57:15 +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
Kamil Trzcinski f230b42f84 On CI Admin page show only projects that are present in GitLab 2015-10-23 11:45:45 +02:00
Kamil Trzcinski 3adfee1c87 Allow developer to manage builds 2015-10-23 11:45:45 +02:00
Kamil Trzcinski 127836dd54 Fix small CI UI regressions 2015-10-23 11:45:45 +02: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