home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
560 Commits
Author SHA1 Message Date
Valery Sizov 7c091d701b Merge branch 'master' into ce_upstream 2015-12-03 14:09:00 +02:00
Achilleas Pipinellis 0ec0c93824 Also update gitlab-workhorse in patch updates [ci skip] 2015-12-02 15:54:44 +02:00
Jacob Vosmaer 7ba00b5082 Use gitlab-shell 2.6.8 in update guide 2015-11-30 19:04:44 +01:00
Valery Sizov 3eb15786e9 Merge remote-tracking branch 'ee_com/8-2-stable-ee' into ce_upstream 2015-11-24 15:00:14 +02:00
Robert Speicher 9d90cca58d Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-20 11:08:15 -05:00
Jacob VosmaerandRobert Speicher b6ec1714a9 Merge branch 'workhorse-version' into 'master' 
Bump GitLab Workhorse version to 0.4.2



See merge request !1830
 2015-11-20 10:25:38 -05:00
Jacob Vosmaer ba4dc176f8 Merge branch 'workhorse-version' into 'master' 
Bump GitLab Workhorse version to 0.4.2



See merge request !1830
 2015-11-20 12:41:26 +00:00
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee 
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
 2015-11-19 10:33:18 -05:00
Robert SpeicherandRobert Speicher 9535d91e8d Merge branch 'update-gitlab-shell-doc' into 'master' 
Update gitlab-shell documentation to 2.6.7



See merge request !1836
 2015-11-19 10:10:00 -05:00
Robert Schilling aec4aac0c2 Update gitlab-shell documentation [ci skip] 2015-11-19 16:06:13 +01:00
Robert Schilling cf61b8e22c Update gitlab-workhorse docs to 0.4.2 2015-11-19 16:01:55 +01:00
Achilleas Pipinellis 03cb8edb34 Merge branch 'http-to-https' into 'master' 
Rewrite HTTP links to force TLS, where possible

I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.

See merge request !1806
 2015-11-17 06:24:36 +00:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
Patricio Cano 2c5cdb2e94 Merge branch 'master' into ee-to-ce-downgrade-doc 
# Conflicts:
#	doc/README.md
 2015-11-16 17:31:19 -05:00
Patricio Cano 6320dfbcce Added documentation on how to downgrade from EE to CE 2015-11-16 17:26:32 -05:00
Valery Sizov 699885c3e9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee 2015-11-16 15:52:03 +02:00
Robert Speicher a060a8dad5 Update doc/update/8.1-to-8.2.md 
[ci skip]
 2015-11-13 13:12:04 -05:00
Robert Speicher 5968f107f3 Add 8.2 CE-to-EE update guide 
[ci skip]
 2015-11-13 13:09:49 -05:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Achilleas Pipinellis 2ee3f8381b Merge branch 'master' into 'master' 
Change documentation of converting a MySQL-Database to a Postgres one

The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904

closes #2904

See merge request !1549
 2015-11-10 01:52:53 +00:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Tim JabsandTim Jabs bdb45360e7 Changed documentation of converting a MySQL-Database with Gitlab to a Postgresdatatabase. The instructions were missleading. See -> https://gitlab.com/gitlab-org/gitlab-ce/issues/2904 2015-11-04 08:30:30 +01:00
Jacob Vosmaer bc89c4f8d9 Make sed command GNU-compatible 2015-10-29 16:34:50 +01:00
Jacob Vosmaer 6119b872fb Add missing "cd" 2015-10-29 16:34:33 +01:00
Jacob Vosmaer c5132e94e1 Switch to gitlab-workhorse 2015-10-29 14:21:24 +01:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Robert SpeicherandRobert Speicher 8052c4ef4e Merge branch 'rs-8-1-update-guide-changes' into 'master' 
Update 8.0-to-8.1 update guide

- User needs to update gitlab-git-http-server
- User needs to update Nginx configuration

[ci skip]

See merge request !1625
 2015-10-20 18:11:38 +02:00
Benny Schimmer 8479feeba2 Simplify patch version updates (less steps) 2015-10-20 00:41:42 +02:00
Robert Speicher b39860b01b Merge branch 'gitlab-git-http-server-version' into 'master' 
Track compatible gitlab-git-http-server version

The 'git archive' changes in GitLab 8.1 require a version of
gitlab-git-http-server that is incompatible with GitLab 8.0, so we
need to keep track of this now.

See merge request !1603
 2015-10-16 19:37:22 +00:00
Robert Speicher 2d7be2d499 Merge remote-tracking branch 'ce/master' 2015-10-16 00:12:30 -04:00
Robert Speicher e92010f0ac Merge branch 'ce_upstream_15_10' into 'master' 
CE upstream

See merge request !34
 2015-10-16 01:18:08 +00:00
Robert Speicher c2c9f6d52d Remove 8.0-only steps from the 8.1 update guide 
Also adds a preamble note that a working 8.0 installation (i.e.,
gitlab-git-http-server, updated Nginx/Apache configs) is required before
proceeding.

[ci skip]
 2015-10-15 18:59:28 -04:00
Robert Speicher 6232bb1ef3 Remove notes about CI migration from 8.1 update guide 
[ci skip]
 2015-10-15 18:18:41 -04:00
Robert Speicher 18d66570a8 Add 8.1 CE-to-EE update guide 
[ci skip]
 2015-10-15 16:27:35 -04:00
Robert Speicher facf8826da Add 8.0-to-8.1 update guide 2015-10-15 16:06:34 -04:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Jacob Vosmaer f7e0357840 Track compatible gitlab-git-http-server version 2015-10-15 13:22:28 +02:00
Hannes Rosenögger cde076c525 Merge branch 'fix-patch_guide' into 'master' 
don't set LATEST_TAG automatically in patch update guide

As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions.

Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags.

[ci skip]

See merge request !1510
 2015-10-12 13:20:07 +00:00
Stan Hu fb7922a8d5 Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master' 
Update upgrade guide for Redis >= 2.4.0 requirement

[ci skip]

Closes #2837

See merge request !1468
 2015-10-08 15:00:20 +00:00
Jan Bruckner a5f6af007a don't set LATEST_TAG automatically in patch update guide 2015-10-05 16:01:39 +02:00
Drew Blessing b72cf6f2a2 Merge branch 'etc-default-gitlab' into 'master' 
Fix path to /etc/default/gitlab in 8.0 update guide



See merge request !1437
 2015-10-01 19:00:57 +00:00
Stan Hu e2108f16ec Update upgrade guide for Redis >= 2.4.0 requirement 
[ci skip]

Closes #2837
 2015-10-01 08:41:20 -07:00
Jacob Vosmaer 3591afeef0 Apache needs gitlab-git-http-server on TCP 2015-09-29 13:37:07 +02:00
Jacob Vosmaer 6055c507cc Fix path to /etc/default/gitlab in 8.0 update guide 2015-09-25 15:40:44 +02:00
Jacob Vosmaer 1c9deece3d Make sure Unicorn listens on localhost:8080 2015-09-25 10:59:36 +02:00
Robert Schilling 83c9752e04 Merge pull request #9664 from fantasywind/patch-1 
Update 7.14-to-8.0.md
 2015-09-24 20:55:55 +02:00
Robert Speicher 3656c2fa53 Merge branch 'rs-troubleshooting' into 'master' 
Add Troubleshooting section to 8.0 docs

[ci skip]

See merge request !1416
 2015-09-24 17:03:12 +00:00
Robert Speicher 58c21dd77b Update Troubleshooting sections 2015-09-24 12:55:00 -04:00
Jacob Vosmaer 040718e106 Refer to Apache templates in 8.0 update guide 2015-09-24 17:47:48 +02:00
Robert Speicher 6e65108325 Add Troubleshooting section to 7.14 to 8.0 Update guide 2015-09-23 20:36:25 -04:00