home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 06:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,117 Commits 48 Branches 340 Tags
52ac3ff1c00cb47cf12e445dbfa0445e5fca625b
Commit Graph
20117 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis 52ac3ff1c0 Merge branch 'fix_permission_doc' into 'master' 
Fixed the permission doc

The guest users was missing "Pull project code" and "Download project".

/cc @axil 

See merge request !1695
 2015-10-28 13:37:46 +00:00
Hannes Rosenögger 910c2a50ef Fixed the permission doc 
The guest users was missing "Pull project code" and "Download project".
 2015-10-28 12:41:56 +01:00
Dmitriy Zaporozhets b6d1d25d43 Merge branch 'gitlab-shell-v2.6.6' into 'master' 
Bump gitlab-shell to v2.6.6



See merge request !1673
 2015-10-28 10:32:18 +00:00
Dmitriy Zaporozhets 940d68cc4c Merge branch 'rs-update-jquery-atwho-rails' into 'master' 
Bump jquery-atwho-rails to ~> 1.3.2

Closes #2858

See merge request !1687
 2015-10-27 13:59:01 +00:00
Robert Speicher d974803ccc Merge branch 'add-project-path-index' into 'master' 
Add projects path index

Fixes performance regression introduced by !1649

See merge request !1692
 2015-10-27 11:22:10 +00:00
Kamil Trzciński da7349a0e2 Merge branch 'builds_to_backup_doc' into 'master' 
Add builds to the docs  as a valid skip option for backups.



See merge request !1666
 2015-10-27 10:32:23 +00:00
Kamil Trzcinski 01c7769c75 Add projects path index 
Fixes performance regression introduced by MR1649
 2015-10-26 20:21:26 +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 2f56d89c9e Update CHANGELOG for 8.1.1 
[ci skip]
 2015-10-26 16:19:07 +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
Robert Speicher 1ae65b2266 Merge branch 'fix-specific-runner-visibility' into 'master' 
Fix visibility of specific runners

See merge request !1688
 2015-10-26 12:49:00 +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
Robert Speicher bf30332ea8 Merge branch 'remove-satellites' into 'master' 
Add migration to remove the contents of the satellites dir

See merge request !1681
 2015-10-26 10:40:13 +00:00
Kamil Trzcinski 6db014987d Fix specific runner visibility 2015-10-26 11:23:11 +01:00
Robert Speicher 63c74bb0ee Bump jquery-atwho-rails to ~> 1.3.2 
Closes #2858
 2015-10-26 10:39:33 +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
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
Jacob Vosmaer 122f02bc39 Remove the contents of the satellites dir 2015-10-23 17:39:22 +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