home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,169 Commits 48 Branches 340 Tags
aae4e3f8a43fb64ebd8dd1ae1479651c8951dec0
Commit Graph
13169 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski aae4e3f8a4 Version 7.4.0-ee. 2014-10-22 15:46:27 +02:00
Marin JankovskiandMarin Jankovski dd0198da1c Merge branch 'fix-500-login-disabled' into 'master' 
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
 2014-10-22 15:30:43 +02:00
Dmitriy Zaporozhets 6f8d581900 Merge branch 'improve-ldap-check-stable' into '7-4-stable-ee' 
Improve ldap check for old syntax [stable]

See merge request !215
 2014-10-22 11:04:43 +00:00
Dmitriy Zaporozhets d79c5f78b6 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 13:15:28 +03:00
Dmitriy Zaporozhets 86d9a782e8 Merge branch 'ee-stable-fix-ldap-check' into '7-4-stable-ee' 
Fix ldap check [stable]

See merge request !214
 2014-10-22 10:12:20 +00:00
Dmitriy Zaporozhets 829bd6ff38 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	lib/gitlab/ldap/adapter.rb
 2014-10-22 11:23:18 +03:00
Valery Sizov 348d03b13f Merge branch '7-4-stable' into 7-4-stable-ee 2014-10-21 19:15:03 +03:00
Valery Sizov be80837a69 Update Guide: Change path to nginx config 2014-10-21 19:12:52 +03:00
Valery Sizov 4e8cc3e19f Merge branch 'add_doc_to_upgrade_ce_to_ee' into '7-4-stable-ee' 
Add reference to the README  to upgrade guide CE to EE

Issue - https://dev.gitlab.org/gitlab/gitlab-ee/issues/183

See merge request !213
 2014-10-21 14:57:09 +00:00
Valery Sizov 6c4c9a8c4c Add doc for upgrading CE to EE 2014-10-21 17:25:15 +03:00
Jacob VosmaerandValery Sizov e88cf107bc Add instructions for multiple LDAP servers 2014-10-21 16:16:17 +03:00
Valery Sizov 6e23e4037c Merge branch 'to_ee_stable_from_ce_stable' into '7-4-stable-ee' 
WIP. CE stable to EE stable

```
Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   config/initializers/1_settings.rb
	both modified:   config/initializers/7_omniauth.rb
	both modified:   features/admin/groups.feature
	both modified:   features/steps/admin/groups.rb

```

@jacobvosmaer There are 4 conflicts. Two of them (last two ones) I merged by myself. In other cases your help would be appreciated.

See merge request !209
 2014-10-21 13:12:25 +00:00
Valery Sizov eed0b3b593 Merge branch '7-4-stable' into ee_stable 2014-10-21 14:39:35 +03:00
Marin JankovskiandValery Sizov 536f61e0e7 Add test for allowed team name of slack. 2014-10-21 14:35:13 +03:00
Marin JankovskiandValery Sizov 9f54397f3a Use allowed slack team name. 2014-10-21 14:35:04 +03:00
Valery Sizov 91402ac0eb Merge branch '7-4-stable' into ee_stable 2014-10-21 13:48:16 +03:00
Valery Sizov b1e60cfa1b remove unnecessary parts from update doc 2014-10-21 13:20:59 +03:00
Valery Sizov 1ea246f167 Merge branch 'error-messages-fix' into '7-4-stable' 
Error messages fix

See merge request !1201
 2014-10-21 10:07:08 +00:00
Valeriy Sizov f28df34a4d Merge pull request #8065 from bbodenmiller/patch-17 
[7.4 rc fix] [doc] clarify when database.yml needs to be updated
 2014-10-21 13:03:25 +03:00
Valeriy Sizov e73a4eeafb Merge pull request #8066 from bbodenmiller/patch-18 
[7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks
 2014-10-21 13:01:54 +03:00
Valeriy Sizov 62929caf29 Merge pull request #8067 from bbodenmiller/patch-19 
[7.4 rc fix] [doc] actually give command necessary to update unicorn
 2014-10-21 13:01:04 +03:00
Valeriy Sizov bc56de15b5 Merge pull request #8070 from bbodenmiller/patch-22 
[7.4 rc fix] [doc] stop gitlab before backup
 2014-10-21 12:47:54 +03:00
Valeriy Sizov 2dd94657dc Merge pull request #8071 from bbodenmiller/patch-7 
[7.4 rc fix] [doc] add missing configure Redis to use sockets
 2014-10-21 12:44:42 +03:00
Valeriy Sizov 39bbf078ff Merge pull request #8072 from bbodenmiller/patch-12 
[7.4 rc fix] [doc] add optimizations for mysql to 6.x->7.4 guide
 2014-10-21 12:43:23 +03:00
Jacob Vosmaer 159eeecef1 Restore Settingslogic.new from 18d87dcf91 2014-10-21 11:27:41 +02:00
Valery Sizov 81b6c9d2e1 Merge branch 'fix-merge-conflict' into 'to_ee_stable_from_ce_stable' 
Fix CE-EE LDAP merge conflicts

See merge request !210
 2014-10-21 08:46:35 +00:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00
Jacob Vosmaer 8beca98d73 Fix CE-EE LDAP merge conflicts 2014-10-21 09:55:13 +02:00
Valery Sizov e769822595 Merge branch '7-4-stable' into to_ee_stable_from_ce_stable 
Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb
 2014-10-20 19:59:36 +03:00
Valery Sizov a54d5dc776 Merge branch 'fixes-from-master' into '7-4-stable' 
Fixes from master

It includes:

* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195

See merge request !1198
 2014-10-20 16:38:23 +00:00
Jan-Willem van der MeerandDmitriy Zaporozhets 3d3726a026 Default the LDAP server label to LDAP 2014-10-20 16:38:08 +03:00
Jan-Willem van der MeerandDmitriy Zaporozhets 49bd981200 Prevent redeclaration of LDAP strategy 2014-10-20 16:38:07 +03:00
Dmitriy Zaporozhets 644fd232db Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Dmitriy Zaporozhets ebc0a7050a Fix group user removal from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Jacob VosmaerandDmitriy Zaporozhets 082d59d21f Ask the wiki repo, not Gollum, if it's empty 
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
 2014-10-20 16:37:20 +03:00
Ben Bodenmiller 4880b91ff1 add optimizations for mysql to 6.x->7.4 guide 
Add mysql optimizations from 7.3-to-7.4.md.
 2014-10-18 02:13:15 -07:00
Ben Bodenmiller 0ff6105589 add missing configure Redis to use sockets 
Add details from 7.2-to-7.3.md. Replaces https://github.com/gitlabhq/gitlabhq/pull/8047.
 2014-10-18 02:08:01 -07:00
Ben Bodenmiller 3e6b284bd0 stop gitlab before backup 2014-10-18 01:51:35 -07:00
Ben Bodenmiller 9a92e53f62 stop gitlab before backup 
Stopping gitlab before backup ensures that backup has everything before upgrade incase something goes wrong. Also remove extra cd.
 2014-10-18 01:49:59 -07:00
Ben Bodenmiller 76e2ae8148 actually give command necessary to update unicorn 
Give command to update unicorn.rb rather than just say you need to do it.
 2014-10-18 01:39:01 -07:00
Ben Bodenmiller 35b1a036d7 stop gitlab before mysql optimizations, run checks 
Update MySQL optimizations to reflect doing updates after GitLab has already been started back up.
 2014-10-18 01:33:51 -07:00
Ben Bodenmiller 768da57fe4 clarify when database.yml needs to be updated 
Clarify that database.yml should be updated if you are running a MySQL Database. Remove wording that de-emphasises importance of update.
 2014-10-18 01:28:50 -07:00
Dmitriy Zaporozhets ba84d01c3c Merge branch '7-4-stable_' into '7-4-stable-ee' 
7-4-stable CE to EE

See merge request !207
 2014-10-17 17:42:53 +00:00
Valery Sizov f59b692420 Merge branch 'gitlab-ee/master' into 7-4-stable_ 
Conflicts:
	VERSION
	doc/install/installation.md
 2014-10-17 20:35:51 +03:00
Dmitriy Zaporozhets f47dfe891d Merge branch 'ee-changelog' into '7-4-stable-ee' 
Added EE changelog

See merge request !204
 2014-10-17 17:02:36 +00:00
Valery Sizov 7e9ff1fc65 Add EE changelog 2014-10-17 19:58:28 +03:00
Valery Sizov 28477c49fa Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into 7-4-stable-ee 2014-10-17 17:09:32 +03:00
Dmitriy Zaporozhets b99eef4481 Merge branch 'ce_master' into 'master' 
CE master to EE master

See merge request !203
 2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets 564c4138e9 Merge branch 'master' into '7-4-stable' 
Merge master into 7-4-stable

See merge request !1189
 2014-10-17 13:57:28 +00:00
Dmitriy Zaporozhets 5a4a1a2fa4 Merge branch 'fix-oauth-block' into 'master' 
Fix user being blocked after oauth sign-in

See merge request !1190
 2014-10-17 12:35:46 +00:00