Commit Graph
3061 Commits
Author SHA1 Message Date
Valery Sizov 7c091d701b Merge branch 'master' into ce_upstream 2015-12-03 14:09:00 +02:00
Hannes Rosenögger 5453eb7d79 Merge branch 'workhorse_in_patch_update' into 'master'
Also update gitlab-workhorse in patch updates [ci skip]

Fixes #3747 

See merge request !1959
2015-12-02 20:36:16 +00:00
Hannes Rosenögger e3fe255c05 fixed the documentation of the Guest role in permission.md 2015-12-02 15:21:02 +01:00
Achilleas Pipinellis 0ec0c93824 Also update gitlab-workhorse in patch updates [ci skip] 2015-12-02 15:54:44 +02:00
Robert Speicher 1ad8b73121 Merge branch 'install-guide-gitlab-shell-version' into 'master'
Install gitlab-shell 2.6.8 in installations from source

[ci skip]

See merge request !1932
2015-12-01 17:55:30 +00:00
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Jacob Vosmaer 55d0e04ffd Auto-detect the required gitlab-shell version 2015-12-01 14:26:57 +01:00
Achilleas Pipinellis 6805f1bc47 Clean up quick start quide [ci skip]
* Remove references to enabling CI since it it will be deprecated
* Revert changes in yaml/README.md, refine it in a separate MR
2015-12-01 10:16:27 +02:00
Achilleas Pipinellis aea5b72faa Remove old images 2015-12-01 09:04:51 +02:00
Achilleas Pipinellis 11b204f131 Final touches for the quick start quide 2015-12-01 09:04:51 +02:00
Achilleas Pipinellis e70fb9cf75 New images for the commit build status 2015-12-01 09:02:40 +02:00
Achilleas Pipinellis 32a3c3e068 Place images in their own dir 2015-12-01 09:00:34 +02:00
Achilleas Pipinellis 3b4806bad9 Add option to enable GitLab CI via .gitlab-ci.yml 2015-12-01 08:58:09 +02:00
Achilleas Pipinellis 1058652a92 Add section of enabling GitLab CI 2015-12-01 08:58:09 +02:00
Achilleas Pipinellis 2c30d11e80 Clean up intro 2015-12-01 08:58:09 +02:00
Job van der VoortandAchilleas Pipinellis 5f6117c0aa update ci docs with yml reason and better quickstart 2015-12-01 08:56:40 +02:00
Douwe Maan d6744ea837 Merge branch 'api-license-info' into 'master'
License information can now be retrieved via the API

Fixes #54 

@DouweM if you have time to review as well, that would be great.

See merge request !65
2015-11-30 20:51:26 +00:00
Jacob Vosmaer a9642ba046 Install gitlab-shell 2.6.8 2015-11-30 19:05:28 +01:00
Jacob Vosmaer 7ba00b5082 Use gitlab-shell 2.6.8 in update guide 2015-11-30 19:04:44 +01:00
Patricio Cano edc6d00bf8 License information can now be retrieved via the API 2015-11-30 13:03:29 -05:00
Douwe Maan 7458f97408 Mention repository mirroring for new projects in docs. 2015-11-30 13:50:28 +01:00
Robert Schilling 85ad2140fa Remove reverence to satellites [ci skip] 2015-11-28 20:53:17 +01:00
Sytse Sijbrandij db1fe56a0e Merge branch 'doc_public_access' into 'master'
Update public access documentation



See merge request !1837
2015-11-28 07:08:17 +00:00
Eirik Lygre b982827812 Add reference to Microsoft's Git Credential Manager for Windows. 2015-11-24 20:55:18 +00:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Valery Sizov 3eb15786e9 Merge remote-tracking branch 'ee_com/8-2-stable-ee' into ce_upstream 2015-11-24 15:00:14 +02:00
Dmitriy Zaporozhets f84fb81970 Merge branch 'required_version_and_docs_update' into 'master'
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
2015-11-23 14:47:35 +00:00
Dmitriy Zaporozhets 7ac112d8e8 Add few fixes to documentation based on comments from review
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-23 15:18:59 +01:00
Robert Speicher 732c2d15d2 Update doc/release/patch.md with more current patch procedures
[ci skip]
2015-11-22 18:24:53 -05:00
Robert Speicher 698455466a Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 23:13:20 -05:00
Robert SpeicherandRobert Speicher 94b33caf84 Merge branch 'fix-award-emoji-api' into 'master'
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
2015-11-21 22:46:18 -05:00
Robert Speicher b166ee6b1d Merge branch 'fix-award-emoji-api' into 'master'
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
2015-11-22 03:45:15 +00:00
Stan HuandRobert Speicher 27821ce01f Merge branch 'consistent-tags-api' into 'master'
Make tag API for release feature consistent

Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`.

On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404.

@stanhu Can you review?
@rspeicher This MR should go into 8.2

See merge request !1864
2015-11-21 22:38:13 -05:00
Stan Hu 9155c82fdc Merge branch 'consistent-tags-api' into 'master'
Make tag API for release feature consistent

Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`.

On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404.

@stanhu Can you review?
@rspeicher This MR should go into 8.2

See merge request !1864
2015-11-21 22:27:48 +00:00
Robert Schilling 04a3d27eab Allow editing a release in API via PUT method 2015-11-21 22:34:53 +01:00
Robert Schilling 3ea05c5b5b Only allow to create a release if it does not exist yet 2015-11-21 22:24:34 +01:00
Robert Schilling 26b12e2c37 Add upvote/downvote fields to merge request and note API to preserve compatibility 2015-11-21 21:36:31 +01:00
Kamil Trzcinski f2318dfc9e Fix CI yaml syntax documentation [ci skip] 2015-11-21 20:25:07 +01:00
Robert Speicher 85d76e665a Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 13:17:11 -05:00
Robert Speicher d241253fff Add award_emoji.png doc image
[ci skip]
2015-11-21 13:16:39 -05:00
Robert Speicher c502695fdb Add award_emoji.png doc image
[ci skip]
2015-11-21 13:15:51 -05:00
Robert Schilling 6f7e90f6db Use POST to create a new release instead of PUT 2015-11-21 18:51:41 +01:00
Robert Speicher 115bbd8a00 Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 12:19:45 -05:00
Robert Schilling faef95af1a API: Return 404 if the tag for a release does not exist 2015-11-21 18:08:45 +01:00
Robert Schilling 2cba93a0d2 Make tag API consistent for release feature 2015-11-21 17:29:26 +01:00
Robert SpeicherandRobert Speicher ae36d23497 Merge branch 'award-emoji-doc' into 'master'
Use award emoticons in GitLab workflow

Remove the old voting slides and use the emoji bar.

[ci skip]

See merge request !1863
2015-11-21 11:09:19 -05:00
Robert Speicher e2d5f9a83a Merge branch 'award-emoji-doc' into 'master'
Use award emoticons in GitLab workflow

Remove the old voting slides and use the emoji bar.

[ci skip]

See merge request !1863
2015-11-21 16:08:12 +00:00
Robert SpeicherandRobert Speicher 81134fd03a Merge branch 'api-tags-doc' into 'master'
Add tags page to readme

The tags page was separated for the release feature but not to the index readme.

[ci skip]

See merge request !1861
2015-11-21 10:50:56 -05:00
Robert Schilling c113e23489 Use award emoticons in GitLab workflow [ci skip] 2015-11-21 16:50:37 +01:00
Robert Schilling ca735446ef Add tags page to readme [ci skip] 2015-11-21 12:13:30 +01:00