home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 05:26:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,127 Commits 48 Branches 340 Tags
9cc31183a042b60337f7704d1babb9463ea2a137
Commit Graph
2660 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets df41707cf0 Merge branch 'master' into 'master' 
Correct grant_type in example

Fix the capitalisation of the grant_type parameter. If it's in capitals it doesn't work, and it also looks like this is a field that we need to fill in when actually it just needs to be the exact string "authorization_code".

See merge request !22
 2015-09-08 19:21:07 +00:00
Alex Warren 1acad14c9e Correct grant_type in example 2015-08-27 13:55:10 +00:00
Marin Jankovski 4cdd78485d Add omnibus-gitlab configuration options to the kerberos doc. 2015-08-27 11:27:15 +02:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master' 
Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921
 2015-08-26 11:16:13 +00:00
Douwe Maan 2088880383 Ignore empty incoming messages. 2015-08-24 10:57:35 -07:00
Sytse Sijbrandij cddf03f717 Specify the branch name of the blog post to prevent the use of spaces. 2015-08-22 19:11:02 +00:00
Douwe Maan 3abb356dd2 Add development documentation for real. 2015-08-21 15:13:22 -07:00
Douwe Maan 50baa1fdd1 Add development section to doc. 2015-08-21 15:03:16 -07:00
Douwe Maan 6ff10340e5 Merge branch 'cernvcs/gitlab-ee-feature/kerberos_auth_for_git_access' 2015-08-21 09:15:48 -07:00
Douwe Maan 123af78561 Add gitlab:reply_by_email:check rake task. 2015-08-20 14:03:04 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 19a049ece9 Make documentation clearer. 2015-08-19 17:43:36 -07:00
Douwe Maan 34026c97b4 Add documentation. 2015-08-19 13:58:14 -07:00
Job van der Voort 3659d3b5c6 Merge branch 'security' into 'master' 
Added note about backing up recovery codes

Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs.

This is why I added a section about it at the top, so they read it before enabling them.

https://twitter.com/deathgreps/status/632006221814464512
https://twitter.com/benniemosher/status/633768429313372160

See merge request !1923
 2015-08-19 10:27:03 +00:00
Dmitriy Zaporozhets 067673fbe7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 11:13:30 +02:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
karen Carias b04914ab46 added note about backing up recovery codes 2015-08-18 15:56:38 -07:00
Dmitriy Zaporozhets 89beb39fcc Make sure blog post MR has WIP keyword 2015-08-18 14:46:01 +00:00
Douwe Maan 0f2616b365 Merge branch 'ldap-group-links-api-doc-fix' into 'master' 
Make the `provider` argument for the LDAP group links API endpoint required

Related to #329

If no `provider` is passed to the API endpoint, the group link is not created properly. Making it required fixes the issue temporarily. It should default to the first provider.

Next step, as mentioned in #329, is to do that.

/cc @job

See merge request !475
 2015-08-17 23:24:30 +00:00
karen Carias 10491b5438 deleted line 2015-08-17 14:42:34 -07:00
Dmitriy Zaporozhets 2e5e167311 Add 7.14 ce to ee doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 18:10:58 +02:00
Dmitriy Zaporozhets 6b175d2e82 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 18:08:04 +02:00
Dmitriy Zaporozhets 5d862509c3 Create update guides for 7.14 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 17:18:09 +02:00
Dmitriy Zaporozhets dcd3396337 Update installation guide with 7.14 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 17:13:33 +02:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Alex Lossent d26f091b94 Support Kerberos authentication for Git HTTP access 
Add support for the Negotiate authentication protocol for Git HTTP access.
This enables Kerberos ticket-based authentication for users who have a
kerberos identity attached to their account.
 2015-08-17 12:11:53 +02:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +02:00
Dmitriy Zaporozhets 5f2562dfc5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-14 11:20:18 +02:00
Job van der Voort d891b23e62 Merge branch 'add-image' into 'master' 
New doc about how to add an image in GitLab Basics

See merge request !1918
 2015-08-13 12:05:16 +00:00
Ben Boeckel 95f8f7c729 api: add 'system', 'upvote', and 'downvote' fields to note queries 
This reverts commit 4c586dc7c2.
 2015-08-12 17:02:33 -04:00
karen Carias 235acd2226 fixed text 2015-08-11 19:18:20 -07:00
karen Carias 1df163866f fixed text 2015-08-11 19:16:13 -07:00
Patricio Cano 72412d8478 Made the provider argument a required one, since the feature wasn't working properly if no provider was given. Related to #329 2015-08-11 14:38:13 -05:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets c0bf026ed8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-11 14:29:43 +02:00
Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master' 
Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136
 2015-08-11 12:27:38 +00:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' " 
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
 2015-08-11 10:26:19 +02:00
karen Carias 95aa13f0b7 fixed text 2015-08-10 17:17:30 -07:00
karen Carias 5ba2d53cfa fixed text 2015-08-10 16:56:02 -07:00
karen Carias e0642b2743 fixed conflict 2015-08-10 16:14:03 -07:00
karen Carias 37b4cfea3a fixed conflict and comment 2015-08-10 16:05:59 -07:00
karen Carias 8344c79508 fixed conflict and comment 2015-08-10 16:03:10 -07:00
Jan Tojnar 9195d65602 Doc: Fix link to gravatar.com 2015-08-10 23:47:32 +02:00
Sytse Sijbrandij (admin) b99cbf47af Database size 2015-08-10 18:39:50 +00:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master' 
See merge request !1077
 2015-08-07 18:47:02 -04:00
karen Carias 082467e8e6 Info about not receiving emails 2015-08-07 13:07:04 -07:00
Achilleas Pipinellis 8ab6bd3eb3 Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227 2015-08-07 22:13:18 +03:00