Commit Graph
2314 Commits
Author SHA1 Message Date
Job van der Voort 26544eabe7 Merge branch 'gmail_actions_doc' into 'master'
Add Gmail actions button for GitLab doc.

Resolves #1517 by adding doc with some notes.

See merge request !1327
2015-09-20 19:45:57 +00:00
Robert Speicher 96790b1aac Merge branch 'fix-failing-migration' into 'master'
Fix failing migration on mysql

We didn't specify that the db user needs the right to create temporary
tables before. That's why the migration will fail on most installations
that installed gitlab according to our documentation. This MR removes
the "TEMPORARY" from the migration and changes the documentation to
include the necessary rights for the future.

Fixes #2590

See merge request !1351
2015-09-19 21:07:43 +00:00
Kamil Trzciński dfa32123e3 Merge branch 'ci_closer_integration' into 'master'
Remove API calls CE->CI



See merge request !1307
2015-09-18 19:50:20 +00:00
Hannes Rosenögger a22b6c591f fix failing migration on mysql
We didn't specify that the db user needs the right to create
temporary tables before.
That's why the migration will fail on most installations.
This commits removes the "TEMPORARY" from the migration
and changes the documentation to include the necessary rights for the future.
2015-09-18 19:49:04 +02:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Douwe Maan 87db46e2d8 Fix typo in Reply by email docs 2015-09-18 12:11:49 +00:00
Job van der Voort 1c303bc0eb Merge branch 'global-key' into 'master'
Note about global keys

Because of tweet https://twitter.com/ChoboIslah/status/639565184806309888

See merge request !1931
2015-09-17 17:19:42 +00:00
karen Carias ca95842f94 fixed text 2015-09-17 09:40:46 -07:00
Marin Jankovski 4e33b47a50 Update the link in integration readme. 2015-09-17 17:08:10 +02:00
Stan Hu b75e4d7149 Merge pull request #9618 from pjknkda/repo-info-to-issue-hook
add repository field to issue hook data
2015-09-17 07:03:47 -07:00
Marin Jankovski 1247076b45 Remove double png. 2015-09-17 13:19:38 +02:00
Jacob Vosmaer 1ab80247bc Remove CI cronjob during migration 2015-09-17 12:23:35 +02:00
Marin Jankovski 8379a1c754 Add Gmail actions button for GitLab doc. 2015-09-17 12:14:28 +02:00
Jungkook Park e4ac2d582c add repository field to issue hook data
add a test for to_hook_data of issue model

update CHANGELOG
2015-09-17 05:33:37 +09:00
Kamil Trzciński cac969229a Merge branch 'fix-nginx' into 'master'
Add missing proxy requests to migration docs

See merge request !1317
2015-09-16 20:02:49 +00:00
Robert Speicher 897e3a20b3 sudo user is git, not gitlab, not gitlab_ci
[ci skip]
2015-09-16 15:34:53 -04:00
Robert Speicher e46f5e60b6 Change 7-14-stable to 8-0-stable in doc/install/installation.md
[ci skip]
2015-09-16 15:32:55 -04:00
Robert Speicher 1ff7833e8c sudo user is gitlab, not gitlab_ci 2015-09-16 15:26:15 -04:00
Robert Speicher 19a63b0ddf Add missing code fence closure 2015-09-16 15:24:51 -04:00
Kamil Trzcinski 50e5950947 Add missing proxy requests to migration docs 2015-09-16 20:45:58 +02:00
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master'
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
2015-09-16 18:34:55 +00:00
Nicolas Bigaouette 5a035238cb Fix in Markdown help page: properly create the link to a wiki page.
The help file on Markdown that is included with Gitlab CE (7.14.3 d321305)
and also gitlab.com (see https://gitlab.com/help/markdown/markdown#links)
contains a typo in the description of a link to a wiki page.
2015-09-16 10:00:27 -04:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Kamil Trzcinski fb0bd4eb2f Added info about gitlab.yml config 2015-09-16 11:08:48 +02:00
Kamil Trzcinski d3886f9d41 Added migration docs and updated installation documentation 2015-09-16 10:58:33 +02:00
Douwe Maan 63b0437323 Merge branch 'reply-by-email-docs' into 'master'
Expand Reply by email documentation

TODO:

- [x] Verify this works on dev server
- [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453)

See merge request !1193
2015-09-16 07:09:56 +00:00
Douwe Maan b92c03730b Tweak text 2015-09-16 09:09:09 +02:00
Kamil Trzcinski 1b464bfe03 Update documentation and config files 2015-09-16 00:28:59 +02:00
Kamil Trzcinski f2d8902341 Start working on migration docs 2015-09-16 00:09:09 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
#	Gemfile.lock
2015-09-15 22:40:35 +02:00
Robert Speicher f01aaba778 Reorder the --without arugments so the database comes first
Hopefully this will make it a bit clearer that we're excluding a certain
database type.

[ci skip]
2015-09-15 13:41:29 -04:00
Robert Speicher d420b608e6 Minor editing of the 7.14-to-8.0 update guide 2015-09-15 13:24:38 -04:00
Hannes Rosenögger 661e317229 Merge branch 'latest_tag_patch_release' into 'master'
Add LATEST_TAG variable to automatically fetch the latest tag

Add LATEST_TAG variable to automatically fetch the latest tag

Replaces !1241

See merge request !1287
2015-09-14 10:37:00 +00:00
Achilleas Pipinellis 0ced0ace28 Add LATEST_TAG variable 2015-09-14 09:54:38 +03:00
karen Carias ef0f4b5144 note about global keys 2015-09-13 21:34:31 -07:00
karen Carias 8e523f49a0 added note 2015-09-13 21:27:29 -07:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-11 16:32:11 +02:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Duke 19cba632d8 fix 7.14 stable branch name 2015-09-09 21:20:51 -03:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Douwe Maan 3b89a68302 Move source section below omnibus section. 2015-09-09 12:11:08 +01:00
Douwe Maan d8795297fa Restructure omnibus instructions to match those for source installations. 2015-09-09 12:10:47 +01:00
Douwe Maan 2c8d5aeaf3 Merge branch 'master' into reply-by-email-docs 2015-09-09 12:01:38 +01:00
Douwe Maan 00ecacf8ea Add to docs 2015-09-09 11:54:48 +01:00
Stan Hu 349054e0ab Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-08 22:59:08 -07:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Robert Speicher 4d6f8a6aee Bump gitlab-shell to v2.6.5 2015-09-08 13:34:07 -04:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master'
Crowd integration

https://dev.gitlab.org/gitlab/gitlabhq/issues/2217

See merge request !1228
2015-09-07 11:20:03 +00:00
Stan Hu a73044320f Fix rake services:doc generation
[ci skip]
2015-09-03 20:54:16 +00:00
Artem V. Navrotskiy 1be79e8e7c Move get user by ID of an SSH key documentation to separate file 2015-09-03 16:32:26 +03:00