home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,899 Commits 48 Branches 340 Tags
ee3a0ed6dddd906fa7deaa3cdfd91531c899298e
Commit Graph
2636 Commits
Author SHA1 Message Date
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
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
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 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 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
Dmitriy Zaporozhets 3c5ef17975 Link merge request doc to README 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 13:07:03 +02:00
Dmitriy Zaporozhets 86bccb71a1 Create ref for every merge request. Add documentation for fetch merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-07 12:54:58 +02:00
karen Carias bac34a38f6 fixed one line 2015-08-06 22:40:38 -07:00
Douwe Maan 4f24eb2aa6 Merge branch 'master' into merge-notifs 2015-08-06 12:16:36 +02:00
Douwe Maan c6799b0e1e Update notification docs 2015-08-06 12:16:05 +02:00
Douwe Maan fff36a8b89 Merge branch 'fix-link-to-guide' into 'master' 
Replace relative url with full path, remove old reference for indexes

See merge request !1091
 2015-08-06 09:12:51 +00:00
Achilleas Pipinellis ce47dd4bb0 Update stable branch in installation documentation. Fixes #2191 2015-08-05 21:09:24 +03:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Dmitriy Zaporozhets 6b9dbe9f5a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-05 14:51:24 +02:00
Dmitriy Zaporozhets 58c0c86dbd Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-08-05 14:50:32 +02:00
Dmitriy Zaporozhets 7538be71e0 Merge branch 'update_release_doc' into 'master' 
update release doc



See merge request !1097
 2015-08-05 12:42:03 +00:00
Job van der Voort 72943ee7e2 Merge branch 'server-note' into 'master' 
Added note about changing servers

Because of tweet https://twitter.com/elraro21/status/628650106850516992

See merge request !1919
 2015-08-05 12:39:16 +00:00
Valery Sizov a567dd20d4 update release doc 2015-08-05 14:11:25 +03:00
Dmitriy Zaporozhets 1cb8588c66 Remove satellites from requirements docs and add CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-05 11:49:02 +02:00
Dmitriy Zaporozhets 46a84d8013 Merge branch 'rs-issue-2135' into 'master' 
Update docs for Ruby MRI 2.1 requirement

Addresses #2135 

See merge request !1089
 2015-08-05 09:21:03 +00:00
Achilleas Pipinellis c90e592e91 Replace relative url with full path, remove old reference for indexes 
Closes #2176 (gitlab.com)
 2015-08-05 08:38:40 +03:00
Achilleas Pipinellis 4c9ba632e9 Merge branch 'master' into 'master' 
updated restore docs wrt backup location [ci skip]

Made sure to point out that the restore location can be overwritten by
an entry in the config.

See merge request !1030
 2015-08-04 21:56:27 +00:00
karen Carias b83b333217 added note about changing servers 2015-08-04 14:51:08 -07:00
Robert Speicher f9d71c4b91 Update docs for Ruby MRI 2.1 requirement 2015-08-04 17:07:12 -04:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets 326b827ce3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-04 15:23:11 +02:00
Job van der Voort e9ba1185f2 Merge branch 'add-user' into 'master' 
Added new doc about adding users and members

Added new doc in workflow about how to add users and members and I also linked it to "permissions".

See merge request !1916
 2015-08-04 08:46:47 +00:00
karen Carias c5a6c16dba typo 2015-08-03 15:55:02 -07:00
karen Carias 28cc6d9b98 text fixed 2015-08-03 15:51:09 -07:00