home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,098 Commits 48 Branches 340 Tags
eb3c4255bf1926a1edf02c2a4792feaaf6fe4091
Commit Graph
20098 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher eb3c4255bf Bump nprogress-rails to 0.1.6.7 
Closes #2866
 2015-10-26 10:14:35 +01:00
Stan Hu f66ec1bc81 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-10-26 06:30:57 +01:00
Stan Hu ef85b31f07 Merge pull request #9769 from jannickfahlbusch/fixTypos 
Fix some grammatical issues
 2015-10-26 06:30:22 +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
Robert Speicher 3c23b6515f Merge remote-tracking branch 'github/master' 2015-10-24 16:01:08 +02:00
Robert Speicher ab72c12028 Remove "Install schedules" step from Installation guide 
[ci skip]
 2015-10-24 15:58:43 +02:00
Jannick Fahlbusch 45399ccc9a Fix some grammatical issues 2015-10-24 12:37:44 +02:00
Robert Schilling 536706fad2 Merge pull request #9767 from jannickfahlbusch/patch-1 
Add missing character
 2015-10-24 08:12:03 +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
Stan Hu ceaf8b73a3 Merge pull request #9765 from drobati/patch-1 
Added missing period in gitlab_flow article.
 2015-10-23 10:36:55 -07:00
Derek Robati b2663d1ca1 Added missing period. 2015-10-23 12:48:17 -04: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
Robert Speicher 201641594d Vendor 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
Kamil Trzcinski 0b25d837b8 Fail builds that also have empty string 2015-10-23 13:33:44 +02:00
Robert Speicher 2b51823017 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 11:31:01 +00: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
Stan Hu 0e73d7b6af Merge pull request #9762 from huacnlee/fix/api-helpers-bad-autoload-name-for-master 
Fix API::APIHelpers -> API::Helpers again for master
 2015-10-22 21:12:35 -07:00
Jason Lee 3d613fe1e8 Fix API::APIHelpers -> API::Helpers; 
Rails Autoload find file to require is use , APIHelpers -> api_helpers.rb, not helpers.rb;
 2015-10-23 11:42:57 +08:00
Stan Hu 69e5e260b0 Add spec for cloning Wiki over HTTP 2015-10-22 14:16:37 -07:00
Stan Hu 64a270a645 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
 2015-10-22 13:53:12 -07: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