home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,832 Commits 48 Branches 340 Tags
2e5596bb0fbc2d9bc00f18387e374dee38b22990
Commit Graph
21832 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 2e5596bb0f Merge branch 'auto_reload_rebase_page' into 'master' 
Page is not reloaded periodically to check if rebase is finished

https://gitlab.com/gitlab-org/gitlab-ee/issues/55

See merge request !43
 2015-10-30 09:05:26 +00:00
Valery Sizov 83473a4f56 Page is not reloaded periodically to check if rebase is finished 2015-10-29 20:17:35 +02:00
Robert Speicher 0528ac637d Merge branch 'ce_upstream' into 'master' 
CE upstream

See merge request !39
 2015-10-26 13:43:53 +00:00
Douwe MaanandValery Sizov b3314704d1 Update ExternalIssueReferenceFilter. 2015-10-23 17:55:16 +02:00
Douwe Maan 1296d9650e Merge branch 're-add-kerberos' into 'master' 
Re-add Kerberos to AuthHelper form-based providers



See merge request !40
 2015-10-23 11:45:29 +00:00
Valery Sizov 6c6f37c8b0 Re-add Kerberos to AuthHelper form-based providers 2015-10-23 13:25:24 +02:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +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
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
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 09637cc908 Merge branch 'invalidate_password' into 'master' 
Invalidate stored jira password if the endpoint URL is changed

https://gitlab.com/gitlab-org/gitlab-ce/issues/2997

See merge request !38
 2015-10-22 13:40:25 +00: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
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
Valery Sizov 7b2669971f Invalidate stored jira password if the endpoint URL is changed 2015-10-22 13:45:25 +02: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
Robert Speicher ae9f81a950 Update CHANGELOG 
[ci skip]
 2015-10-22 11:00:48 +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
Kamil Trzciński 46e66f5845 Merge branch '3147-gitlab-ci-yml-variables-adjust-docs' into 'master' 
Fixed suggestion in documentation resulting in linting error 'variables should be a map of key-valued strings'

Documentation now suggests a valid option with the intended result.

See #3147 

`"yes"`, opposed to `yes` is not casted to a boolean. `variables` only accepts key-valued strings.

Better solution would be to change the parsing of `variables` (allow boolean or check the actual value of the string).



See merge request !1660
 2015-10-22 07:40:17 +00: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
Sander Boom 38a93a25f3 Fixed linting error 'variables should be a map of key-valued strings' 2015-10-21 22:52:17 +02: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
Robert Speicher 323b6eb196 Merge branch 'remove-ci-migration' into 'master' 
Remove CI migration

See merge request !1656
 2015-10-21 10:17:19 +00:00
Kamil Trzcinski b7b0010f7b Remove CI migration task 2015-10-21 12:13:09 +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