home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jan-Gerd Tenberge c5146ca151 Fix merge error 2015-10-23 03:00:08 +02: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
Jan-Gerd Tenberge 355a745842 Merge branch 'gitlabhq-master' into gravatar-retina 2015-10-22 21:43:35 +02:00
Jan-Gerd Tenberge b5c19bcc4d Fix merge error 2015-10-22 21:43:17 +02:00
Jan-Gerd Tenberge b32bb37799 Merge remote-tracking branch 'origin/master' into gravatar-retina 2015-10-22 21:37:44 +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
Artem V. Navrotskiy 835f6a2b51 Bump gitlab-shell to v2.6.6 2015-10-22 19:02:55 +03: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
Douwe Maan 46025ffb8c Fix specs 2015-10-22 15:40:42 +02:00
Douwe Maan aa4007a597 Slight refactoring 2015-10-22 15:40:36 +02:00
Douwe Maan 51ed8fd706 Use correct var name 2015-10-22 15:40:21 +02:00
Douwe Maan c746a1de4e Use faster, more appropriate pipeline for mentionable attributes 2015-10-22 15:40:02 +02:00
Douwe Maan c1ecfb5de9 Disabling caching in test environment because it was causing issues with Markdown 2015-10-22 15:38: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
Marin Jankovski 3c3e57705f Add builds to the docs as a valid skip option for backups. 2015-10-22 14:22:49 +02: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
Robert Speicher b3e10e37f7 Merge branch 'fail-on-empty-job-name' into 'master' 
Require jobs to be named

This properly presents error for .gitlab-ci.yml having empty job name.

See merge request !1662
 2015-10-22 11:54:05 +00:00
Robert Speicher 0bb2e94674 Merge branch 'fix-css-for-runner' into 'master' 
Fix CSS class for runner status

Fixes #3117 

See merge request !1665
 2015-10-22 11:44:12 +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 adba37f99a Use markdown with gfm pipeline rather than gfm method 2015-10-22 11:02:26 +02:00
Robert Speicher ae9f81a950 Update CHANGELOG 
[ci skip]
 2015-10-22 11:00:48 +02:00
Douwe Maan f65840bc84 Fix Markdown XHTML context param 2015-10-22 11:00:34 +02:00
Douwe Maan c7c5bd4843 Change dashboard snippet index menu class to match test 2015-10-22 10:46:54 +02:00
Kamil Trzcinski 2305483d7d Require jobs to be named 2015-10-22 10:39:00 +02:00
Douwe Maan 8b127f4526 Merge branch 'bozaro-empty-repo' 2015-10-22 10:25:57 +02:00
Douwe Maan 57382d6170 Fix changelog 2015-10-22 10:25:17 +02:00
Douwe Maan 98f982f91d Only postgres does case sensitive compares 2015-10-22 10:19:12 +02:00
Douwe Maan 05cb65dc1f Fix Gitlab::Database#mysql? 2015-10-22 10:18:44 +02:00