home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,041 Commits 48 Branches 340 Tags
041cae67929c1a2340092e115d4e376245a42a1b
Commit Graph
24041 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 041cae6792 Merge pull request #10042 from sestus/master 
Typo fix in README.md of ci quick-start docs.
 2016-02-19 22:12:23 +01:00
Rémy Coutable 0a71920f65 Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' 
Mention project name in fork notice

_Originally opened at !1186 by @axil._

- - -

I missed this one in !1070

See merge request !2897
 2016-02-19 16:35:53 +00:00
Achilleas PipinellisandRémy Coutable c6e0db03eb Mention project name in fork notice 2016-02-19 17:06:14 +01:00
Patricio Cano 75ad91822d Merge branch 'saml-decoupling' into 'master' 2016-02-19 10:41:54 -05:00
Kamil Trzciński 1817b766b2 Merge branch 'ci/api-runners' into 'master' 
Add runners API

References #4264

See merge request !2640
 2016-02-19 13:23:28 +00:00
Jacob Schatz c21c8825d8 Merge branch 'issue_11872' into 'master' 
Put project visibility icon next to title

Fixes #11872

See merge request !2885
 2016-02-19 12:26:59 +00:00
Tomasz Maczukin f2f6f77328 Rename Entities::ForkedFromProject to Entities::BasicProjectDetails 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 982368815e Add CHANGELOG entry 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 49d5c35b69 Fix old usages of ci_runner factory 2016-02-19 13:18:49 +01:00
Tomasz Maczukin acfe25edc0 Refactorize ci_runner factory and let definitions in runners API spec 2016-02-19 13:18:49 +01:00
Tomasz Maczukin e4d2f9972c Change last_contact to contacted_at 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 7ea60c8564 Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject 2016-02-19 13:18:49 +01:00
Tomasz Maczukin f8f492e589 Remove unnecessary parameters 2016-02-19 13:18:49 +01:00
Tomasz Maczukin a5540b385d Modify expectations for update runner feature 2016-02-19 13:18:48 +01:00
Tomasz Maczukin d38322b895 Change .map{...}.inject{...} to any?{...} for searching shared runners 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 957c4de9b1 Reorganize let statements in spec/requests/api/runners_spec.rb 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 2ef196deb2 Change interpolation to named placeholder in owned_or_shared scope 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 4ebadb77dd iChange name and path to name_with_namespace and path_with_namespace in RunnerProjectDetails 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 05e7335664 Update docummentation - specific runner enabling 
[ci skip]
 2016-02-19 13:18:48 +01:00
Tomasz Maczukin b36116f9ad Move :runner_id param to POST body when enabling specific runner in project 2016-02-19 13:18:48 +01:00
Tomasz Maczukin dc182dc50e Add some modifications to spec/requests/api/runners_spec.rb 2016-02-19 13:18:48 +01:00
Tomasz Maczukin d1ac00aea3 Modify and fix output of delete and update of a runner 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 24eed1c5c1 Modify runner projects selecting method in runners API 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 36e7ffea5d Fix runners filtering 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin 97c88966bb GET /runners is for specific runners only 
[ci skip]
 2016-02-19 13:18:47 +01:00
Tomasz Maczukin f21b15d5f5 Limit projects to user available projects if user is not an admin 2016-02-19 13:18:47 +01:00
Tomasz Maczukin b58744cd93 Modify authentication check methods in runners API 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 553bac57d0 Add token to runner details output in API 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin dc32af9508 More fixes in runners doc 
[ci skip]
 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin a09ae17337 Correct PRIVATE-TOKEN to use dash instead of underscore 2016-02-19 13:18:47 +01:00
Achilleas PipinellisandTomasz Maczukin d4f1bcdd28 Note that ci/api/runners.rb is still used 
[ci skip]
 2016-02-19 13:18:47 +01:00
Tomasz Maczukin f562a477f2 Add associated project info to runner details output 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 16b3368af3 Fix runners API spec 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 81ced6f55b Split /runners entrypoint to /runners and /runners/all 2016-02-19 13:18:47 +01:00
Tomasz Maczukin b56ee397bb Add some fixes in runners API documentation 2016-02-19 13:18:46 +01:00
Achilleas PipinellisandTomasz Maczukin cd62c74700 Add Example response above each json output 
[ci skip]
 2016-02-19 13:18:46 +01:00
Achilleas PipinellisandTomasz Maczukin 1532d28c69 Add note of deprecation in old Runners CI API 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 43c8daf3dc Add runners API documentation [ci-skip] 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 53f775ae6d Fix runners filtering in API 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 8c37f0ff30 Add missing methods documentation; fix rubocop reported violation 2016-02-19 13:18:46 +01:00
Tomasz Maczukin d42ced44d9 Add feature to enable/disable runner in project 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 128be3c010 Add basic runners management API 
- add feature to list runners
- add feature to show runners details
- add feature to delete runner
- add feature to update runner
 2016-02-19 13:18:46 +01:00
Achilleas Pipinellis e586858eb5 Merge branch 'web_editor' into 'master' 
Update web editor documentation

Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045

Closes #4262

See merge request !2776
 2016-02-19 10:49:28 +00:00
Douwe Maan a33b63b7d4 Merge branch '12791-hide-project-limit-reached-warning' into 'master' 
Project limit is reached warning is hidden when the projects_limit is zero

Fixes #12791

See merge request !2890
 2016-02-19 09:00:36 +00:00
Zeger-Jan van de Weg 8dc8006918 Project limit is reached warning is hidden when the projects_limit is zero 
Fixes #12791
 2016-02-19 09:27:43 +01:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master' 
Update Gemojione for new hotness ✨

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
 2016-02-19 08:11:02 +00:00
Douwe Maan cb0b7de482 Merge branch 'fix/project-forks-page' into 'master' 
workaround for forks with an invalid repo

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465

The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. 

With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem...

Also fixing Sentry issue: 1180
`undefined method 'already_forked?' for nil:NilClass `


See merge request !2836
 2016-02-19 08:00:58 +00:00
Douwe Maan c58a02e82f Merge branch 'rs-show-owner-label' into 'master' 
Allow `ProjectTeam#human_max_access` to return "Owner"



See merge request !2881
 2016-02-19 07:50:05 +00:00
Douwe Maan 48467d3072 Document true/false as supported value. 2016-02-19 07:43:00 +00:00
James Lopez f3b6839a4a update based on feedback 2016-02-19 08:09:20 +01:00