home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,834 Commits 48 Branches 340 Tags
e5752d9f578a5ccf045fa4988041c8cbcc4c82b4
Commit Graph
2755 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Kamil Trzcinski 156ace4778 Add missing rake and change nginx config for CI migration 2015-09-22 09:45:52 +02:00
Robert Speicher eb5fd3f86b Merge branch 'rs-ci-migration-guide' into 'master' 
Reformat and copy edit the CI-to-CE migration guide

[ci skip]

See merge request !1335
 2015-09-22 02:11:35 +00:00
Robert Speicher 524381dcf0 Add note about automatically re-enabling CI during migrate task 
[ci skip]
 2015-09-21 21:19:09 -04:00
Robert Speicher da54661bbc Remove unintended linebreak 2015-09-21 21:10:50 -04:00
Robert Speicher 541d08b8f6 Be consistent about "only required for manual install" notes 2015-09-21 21:10:16 -04:00
Robert Speicher 96fd255597 More migration guide updates 
- Rename "Finishing Up" to "Nginx configuration"
- Add fourth "Finishing Up" section
- Add Troubleshooting section with a link to backup restoration docs
- Change a few indented blocks into fenced blocks so they're highlighted
  properly.
- Added Marin's suggestions for CI-to-CE-on-different-server section.
 2015-09-21 18:51:01 -04:00
Robert Speicher 7fa0c793d2 Whitespace 2015-09-21 18:02:50 -04:00
Kamil Trzcinski 12969a14dd Add commands for Omnibus installation 2015-09-21 22:47:33 +02:00
Kamil Trzcinski 157ee6623c Update guide 2015-09-21 22:36:33 +02:00
Douwe Maan 017219e7f5 Tweak text 
[ci skip]
 2015-09-21 11:42:36 +02:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Robert Speicher d511edc952 More migration guide updates 
Fixes a few links and typos, and reorganizes the CI "Create a backup"
section.
 2015-09-20 18:58:09 -04:00
Kamil Trzcinski fc8ae32bce Update migration guide 2015-09-20 23:45:35 +02:00
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
Robert Speicher 62c0e5ab6a Redcarpet didn't like unordered lists deeply nested in an ordered one 
I don't really like making these an ordered list since they're mutually
exclusive, but I think the structure is what's important.

[ci skip]
 2015-09-17 16:38:31 -04:00
Robert Speicher eae049505c Fix link to "create a database dump" header 2015-09-17 16:35:59 -04:00
Robert Speicher 8cc788be4e Indent database dump steps one more level 
[ci skip]
 2015-09-17 16:29:06 -04:00
Robert Speicher 567eac0396 Reformat and copy edit the CI-to-CE migration guide 2015-09-17 16:24:00 -04: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
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +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