home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,438 Commits 48 Branches 340 Tags
7486bc0ae33adc141abbca2ea5dea833e56d5409
Commit Graph
1777 Commits
Author SHA1 Message Date
Robert Schilling 8aabb58d5b Merge pull request #8757 from bbodenmiller/patch-1 
formatting cleanup on mysql_to_postgresql.md
 2015-02-28 23:14:08 +01:00
Robert Schilling 3678b64b4a Merge pull request #8758 from bbodenmiller/patch-3 
use gitlab branch of mysql-postgresql-converter
 2015-02-28 23:13:08 +01:00
Robert Schilling e45811c12e Merge pull request #8803 from Bugagazavr/patch-2 
Correct json payload [ci skip]
 2015-02-28 23:05:27 +01:00
Dmitriy Zaporozhets c85935c42a Merge branch 'mmonaco/gitlab-ce-api-user-noconfirm' into 'master' 
Add 'confirm' option to users api

For #1990

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/129

See merge request !1610
 2015-02-27 22:59:44 +00:00
Dmitriy Zaporozhets 0d22b75b03 Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirm 
Conflicts:
	lib/api/users.rb
 2015-02-27 13:01:57 -08:00
Marin Jankovski 3e6b342a1a Remove CI sections related to release tool, update steps in monthly and patch release documentation. 2015-02-27 10:38:15 -08:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Douwe Maan 56f51bed6b Expand Bitbucket integration docs. 2015-02-25 00:06:55 +01:00
Dmitriy Zaporozhets 46516411ef Merge branch 'web_editor_branch' into 'master' 
Web Editor: save to new branch

Implements #1931

See merge request !1523
 2015-02-24 19:38:45 +00:00
Valery Sizov 53e404144c changelog && documentation 2015-02-24 20:36:11 +02:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Igor Bogoslavskyi 51b18fe6f6 typo fixed 
fixed a typo in an url to gitlab-ssl. Now it does not return the 404 error
 2015-02-24 10:50:18 +01:00
Marin Jankovski 2feaa69cd5 Update version of gitlab-shell in the installation and update documentation. 2015-02-23 23:10:35 -08:00
Patrik Kernstock 2bf0a690bf Update 7.7-to-7.8.md 2015-02-22 21:39:13 +01:00
Robert Schilling 50305c363b Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 2015-02-22 10:54:28 +01:00
Marin Jankovski 8ae3112b3f Merge branch 'upload-xss-access-control' into 'master' 
Fix note attachments XSS and access control

Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032.

@marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged?

See merge request !1553
 2015-02-20 22:47:54 +00:00
Douwe Maan 08874d2b51 Make changes to nginx config less likely to break something. 2015-02-20 23:27:17 +01:00
Douwe Maan 0c4d27e82d Point out nginx config changes in update guides. 2015-02-20 22:36:19 +01:00
Dmitriy Zaporozhets 92434b29cc Extend project web hooks with more data 
* add git_http_url and git_ssh_url to project web hook
* add visibility_level to project web hook
* add documentation about project visibility_level in API
 2015-02-20 10:27:37 -08:00
Dmitriy Zaporozhets e480e45a8b Merge branch 'doc-omnibus-differences' into 'master' 
Document fun facts about omnibus-gitlab

I hope this helps developers understand some of the differences.

See merge request !1546
 2015-02-19 19:02:50 +00:00
Jeroen van Baarsen cbf6b6871e Merge pull request #8802 from Bugagazavr/patch-1 
Update API branches documentation [ci skip]
 2015-02-19 13:04:24 +01:00
Jacob Vosmaer 93e42f690b Document fun facts about omnibus-gitlab 2015-02-19 11:20:58 +01:00
Dmitriy Zaporozhets a3d039259e Fix broken links in documentation 2015-02-18 22:07:09 -08:00
Dmitriy Zaporozhets ff70d2f24e Improve GitLab.com integration documentation 2015-02-18 22:06:49 -08:00
Sytse Sijbrandij 10e4e2110c Improve the explanation and linking of the Oauth docs. 2015-02-18 20:49:19 -08:00
Dmitriy Zaporozhets 24d939afb9 Remove Group#owner_id from API since it is not used any more 2015-02-17 16:23:44 -08:00
Marin Jankovski b6a678ef43 Use correct shell version in update doc. 2015-02-16 20:27:58 -08:00
Patricio Cano d11c64a67f Updated the installation and update guides 2015-02-16 17:51:29 -08:00
Patricio Cano 2df8a91c82 Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar. 2015-02-16 09:10:07 -08:00
Dmitriy Zaporozhets 26d594f2dd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-15 19:00:53 -08:00
Bugagazavr b86caf0de3 Correct json payload [ci skip] 2015-02-16 02:10:47 +03:00
Bugagazavr 3ab07b8aae Update API branches documentation [ci skip] 2015-02-15 17:18:13 +03:00
Zhang Sen ebd00cc7f0 Fix wrong word in document of google oauth 2015-02-15 18:24:00 +08:00
Marin Jankovski d76c5824bc Update oauth documenatation with examples for omnibus package and installations from source. 2015-02-13 14:49:19 -08:00
Dmitriy Zaporozhets d0f045eb86 Merge branch 'improve_doc' into 'master' 
Gitlab.com importer: Doc && screenshots

See merge request !1520
 2015-02-13 18:35:15 +00:00
Valery Sizov 78124d9783 GitLab.com importer: documentation 2015-02-13 20:19:16 +02:00
Dmitriy Zaporozhets 6d523db7f6 Merge branch 'log_doc' into 'master' 
Log documentation

See merge request !1513
 2015-02-13 18:06:56 +00:00
Dmitriy Zaporozhets 1b81b29431 Merge branch 'oauth2_doc' into 'master' 
Oauth2 provider doc

See merge request !1519
 2015-02-13 18:00:57 +00:00
Dmitriy Zaporozhets b8cc501c3e Merge branch 'add_tracker_integration_doc' into 'master' 
Add tracker integration doc and help page on service

Added documentation on how to enable tracker integration. Fix the active link on the admin page. Added help under the JIRA service page.

See merge request !1508
 2015-02-13 17:57:39 +00:00
Valery Sizov d9b32f20c6 OAuth2 provider documentation 2015-02-13 19:27:50 +02:00
Marin Jankovski 01c6806f80 Text changes recommended by Job. 2015-02-13 08:56:25 -08:00
Valery Sizov 25ff20677e log documentation 2015-02-13 15:05:37 +02:00
Marin Jankovski eccf695640 Explained in the integration documentation how to enable external issue tracker 2015-02-12 17:06:55 -08:00
Dmitriy Zaporozhets 2be3a012ff Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-12 14:43:02 -08:00
Douwe Maan 4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00
Jeroen van Baarsen b92a6f7c24 Merge pull request #8739 from jvanbaarsen/pr/7818 
note about latest details being on master branch
 2015-02-12 11:25:40 +01:00
Vinnie Okada b0dacc8eb0 Edit group members via API 
Add an API endpoint to update the access level of an existing group
member.
 2015-02-11 18:53:07 -07:00
Sytse Sijbrandij 0a97b1b1a7 Merge pull request #8778 from al3x-edge/fix-emoji-link 
Update Emoji Cheat Sheet Link
 2015-02-11 17:04:38 -08:00
Alexander AmbroseandAlexander Ambrose e8335a65e3 Change emoji cheat sheet link to Amazon S3 
The emoji cheat sheet link was changed. Commit changes the url to the
updated link and fixes issue #8554.
 2015-02-11 20:02:24 -05:00