home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 48 Branches 340 Tags
5a1706791e46fd69a67fcdebfc384a702b00a7ff
Commit Graph
2784 Commits
Author SHA1 Message Date
Douwe Maan 9664424cab Merge branch 'ci/api-projects' into 'master' 
Extend projects API with CI data

Reference #4264 

See merge request !2303
 2016-01-13 13:32:35 +00:00
Dmitriy Zaporozhets 32a5b741c2 Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadle/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 10:12:30 +01:00
Robert Speicher 3dfb69a59f Prepare Installation and Update docs for 8.4 RC1 
[ci skip]
 2016-01-12 18:04:02 -05:00
Robert Speicher 025f061765 Merge branch 'gitlab-omnibus-really' into 'master' 
Never heard of gitlab-omnibus

See merge request !2388
 2016-01-12 16:59:10 +00:00
Jacob Vosmaer 9cbdc2d860 Merge branch 'gitlab-workhorse-0.5.4' into 'master' 
Use gitlab-workhorse 0.5.4

Fixes routing errors for /api/v3/projects/

See merge request !2391
 2016-01-12 15:55:11 +00:00
Achilleas Pipinellis 8f1c46d18a Merge branch 'add_make' into 'master' 
added make command to docs

The gitlab-workhose update docs are missing a make command

See merge request !2281
 2016-01-12 15:22:54 +00:00
Jacob Vosmaer 0e769d2a48 Use gitlab-workhorse 0.5.4 
Fixes routing errors for /api/v3/projects/
 2016-01-12 15:18:17 +01:00
Jacob Vosmaer fac252c9a2 Never heard of gitlab-omnibus 2016-01-12 14:47:55 +01:00
Robert Schilling 3ea637ed5d Merge branch 'typo-fix' into 'master' 
[ci skip] Fixed minor typo in docker documentation

This change is self-explanatory.

See merge request !2374
 2016-01-12 01:24:00 +00:00
Robert Speicher 5d63ad21a6 Merge branch 'gitlab-workhorse-0.5.3' into 'master' 
Use gitlab-workhorse 0.5.3

See merge request !2367
 2016-01-11 17:43:35 +00:00
John Galt 0f113828fa [ci skip] Fixed minor typo in docker documentation 2016-01-11 10:02:39 -07:00
Tomasz Maczukin fc4108b38b Modify CI features in projects API 2016-01-11 15:27:20 +01:00
Drew Blessing 67aa0b8c4c Optimize LDAP and add a search timeout 2016-01-11 08:17:32 -06:00
Jacob Vosmaer 13c3562217 Use gitlab-workhorse 0.5.3 2016-01-11 13:05:32 +01:00
Achilleas Pipinellis 5270cc6958 Merge branch 'doc-update' into 'master' 
Update docs for shared runner default settings

GitLab 8.2 updated shared runners to default to `ENABLED` on all projects.

Fixes #5993

See merge request !2358
 2016-01-11 11:32:10 +00:00
Robert Speicher 70cba8e9a8 Remove outdated gitlab-git-http-server reference from Install doc 
[ci skip]
 2016-01-10 19:59:40 -05:00
Luke Waite e6dbbafd0a Update docs for shared runner default settings 
Fixes #5993
 2016-01-10 08:29:50 -05:00
Achilleas Pipinellis 11b4c0d3cf Clean up document on adding users to a project 
[ci skip]
 2016-01-09 11:03:10 +01:00
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master' 
Add API project upload endpoint

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

See merge request !2329
 2016-01-08 20:29:43 +00:00
Achilleas Pipinellis 255a63564b Merge branch 'docs_project_services' into 'master' 
Project services and JIRA documentation clean up

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176

This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more.

@Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well.

@dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better.

See merge request !2345
 2016-01-08 15:05:35 +00:00
Achilleas Pipinellis 65c474997d Add JIRA 7 to the supported versions 
[ci skip]
 2016-01-08 15:59:00 +01:00
Dmitriy Zaporozhets b64ec38aae Merge branch 'api-delete-tag' into 'master' 
Delete tag via API

### What does this MR do?

Implements deleting a tag via the API.

### Are there points in the code the reviewer needs to double check?

On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111).

###  What are the relevant issue numbers / Feature requests?

* This MR closes #1575 
* Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api

@stanhu Could you do a review?

See merge request !1862
 2016-01-08 13:47:42 +00:00
Achilleas Pipinellis 1d48b180bc Clean up the JIRA integration document [ci skip] 
- new images where needed
- move images to a separate img directory
- use table for the service fields
- link to new documents
 2016-01-08 13:19:40 +01:00
Achilleas Pipinellis 629becde2f Split external issue tracker document 
[ci skip]
 2016-01-08 12:43:33 +01:00
Achilleas Pipinellis b059fa5509 Clean up integration README 
[ci skip]
 2016-01-08 10:40:45 +01:00
Achilleas Pipinellis e4411a9612 Merge branch 'docs_project_services' into 'master' 
Update project services to include all supported ones

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/80

See merge request !2297
 2016-01-08 09:34:07 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Tommy Beadle 1f64332e11 Include user_username in user_(add_to/remove_from)_(project/group) system hooks. 2016-01-07 12:54:54 -05:00
Tommy Beadle dada25d447 Include the username in user_create/destroy system hooks. 2016-01-07 12:54:35 -05:00
Douwe Maan 1886d727f7 Add API project upload endpoint 2016-01-07 13:37:14 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Tomasz Maczukin ba9799b42f Update ./doc/api 2016-01-07 10:39:02 +01:00
Achilleas Pipinellis 0deeebc175 Merge branch 'doc_enable_disable_ci' into 'master' 
Add documentation on enabling/disabling GitLab CI

Closes #4289

See merge request !2320
 2016-01-07 09:12:46 +00:00
Achilleas Pipinellis a8e23bd1b5 Fix hyphenation typos [ci skip] 2016-01-07 10:10:46 +01:00
Achilleas Pipinellis 12e32224c1 Add documentation on enabling/disabling GitLab CI 
[ci skip]
 2016-01-06 20:18:27 +01:00
Janis Meybohm da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00
Douwe Maan 7884a26176 Merge branch 'import-gh-pull-requests' into 'master' 
Import GitHub Pull Requests into GitLab

Fixes #2833

See merge request !2168
 2016-01-06 12:58:32 +00:00
Dmitriy Zaporozhets 797c2326c3 Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce 2016-01-06 10:51:17 +01:00
Douglas Barbosa Alexandre e194b962d3 Update doc for importing existing GitHub projects to GitLab 2016-01-05 15:24:55 -02:00
Achilleas Pipinellis 57a68c722c Update project services to include all supported ones 
[ci skip]
 2016-01-05 13:59:32 +01:00
Felix Eckhofer 766a59630f Fix grammar 2016-01-05 13:06:23 +01:00
Felix Eckhofer ca8639a466 Clarify the key generation step 
Users must not change the default filename or they will have to create a
suitable .ssh/config which is out-of-scope here.
 2016-01-05 13:06:08 +01:00
Felix Eckhofer d17945bb4e Remove misleading ssh-dsa 
The keytype field is actually `ssh-dss` for DSA keys and they will not
be stored as `id_rsa.pub`.

Note that newer version of ssh actually also support
`ecdsa-sha2-nistp256` and others so it is also misleading to assume the
field always starts with `ssh-`.
 2016-01-05 13:04:49 +01:00
Dmitriy Zaporozhets 7f2127ee4c Merge remote-tracking branch 'origin/crosslink-env-docs' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-05 10:36:35 +01:00
Steve Norman 79ec7f2897 Added system hooks messages for renaming and transferring a project 2016-01-04 13:48:00 +00:00
Achilleas Pipinellis 34e1c18c53 Merge branch 'docs/local-share-upload' into 'master' 
docs: raketasks: Add documentation on uploading to mounted shares

Fog has a local storage provider, which can be use to copy backups to locally mounted cifs / nfs / smb shares. This MR adds documentation to doc/raketasks/backup_restore.md in response to #3387.

@stanhu I found some time tonight and was able to get this started earlier than I initially expected, glad I could contribute.

See merge request !2246
 2016-01-04 08:42:39 +00:00
Christian Mehlmauer 0134a85bee added make command to docs 2016-01-04 00:29:30 +01:00
Achilleas Pipinellis 636ae8bc82 Merge branch 'fix_broken_docs_link' into 'master' 
Fix broken SVN migration link

Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45

See merge request !2271
 2016-01-01 12:58:00 +00:00
Achilleas Pipinellis 26de72a233 Fix broken SVN migration link [ci skip] 2016-01-01 13:52:26 +01:00
Gabriel Mazetto 82bfa8f40c Added additional config environmental variables to help Debian packaging 
* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO
 2015-12-30 12:45:24 -02:00