home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,196 Commits 48 Branches 340 Tags
8df0f69282253fb5c851bfc2ae7ca3727fac23c2
Commit Graph
13196 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 8df0f69282 Merge branch '7-4-stable_non_conflict' into '7-4-stable-ee' 
7-4-stable CE to EE

See merge request !225
 2014-10-29 16:16:04 +00:00
Valery Sizov a00cfa191a update changelog 2014-10-29 16:55:19 +02:00
Dmitriy ZaporozhetsandValery Sizov 482cdcf492 Explicitly require addressable gem feature you need. Fixes Buildbox CI integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:48:25 +02:00
Valery Sizov 1a97c3c4aa Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-29 16:13:36 +02:00
Valery Sizov 1ab1526d92 Fix raw view for public snippets 2014-10-29 16:11:28 +02:00
Dmitriy ZaporozhetsandValery Sizov a2dfff418b Dont allow guests..developers to manage group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:55 +02:00
Dmitriy ZaporozhetsandValery Sizov 995d198419 Split group members api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:46 +02:00
Dmitriy ZaporozhetsandValery Sizov 43fba7f0c5 Add failing test that should be green after group members api get fixed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:00:38 +02:00
Valery Sizov 912715c3e4 update changelog && bump version 2014-10-29 15:59:57 +02:00
Valery Sizov 3f57c97c31 Merge branch 'fix_internal_snippets_ee' into '7-4-stable-ee' 
Fix internal snippets

See merge request !219
 2014-10-24 17:31:43 +00:00
Jacob Vosmaer 477743a154 Merge branch 'fix_internal_snippets' into '7-4-stable' 
Fix internal snippets

See merge request !1216
v7.4.2 		2014-10-24 17:18:46 +00:00
Valery Sizov 526b21c4a9 internal snippets: fix exposing of title 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-24 19:44:42 +03:00
Valery Sizov 7f97a1277d internal snippets: fix exposing of title 2014-10-24 19:39:14 +03:00
Valery Sizov 6adf3bbd67 update changelog 2014-10-24 16:22:36 +03:00
Valery Sizov 9b5fc182c5 Merge branch 'ce_stable' into '7-4-stable-ee' 
CE stable to EE

conflict in lib/gitlab/ldap/adapter.rb should be resolved

See merge request !217
 2014-10-24 13:17:13 +00:00
Jacob Vosmaer 4272926f55 Fix merge conflict in lib/gitlab/ldap/adapter.rb 2014-10-24 13:58:28 +02:00
Valery Sizov dd559674e2 Merge branch '7-4-stable-ee' into ce_stable 
Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb
 2014-10-24 13:37:25 +03:00
Valery Sizov 9712fbcdd3 Bump to 7.4.1 v7.4.1 2014-10-24 13:30:04 +03:00
Jacob VosmaerandValery Sizov d4ae4fe670 Bump gitlab_git to 7.0.0.rc10 (submodules fix) 2014-10-24 13:24:27 +03:00
Jacob VosmaerandValery Sizov 16a10eb1cd Fix LDAP config lookup for provider 'ldap' 2014-10-24 12:53:32 +03:00
Valery Sizov 5f7906e163 fix for public snippet 2014-10-24 12:52:59 +03:00
Jacob VosmaerandValery Sizov e8da077d4f Fix LDAP authentication for Git HTTP access 
Conflicts:
	CHANGELOG
 2014-10-23 17:53:19 +03:00
Marin Jankovski aae4e3f8a4 Version 7.4.0-ee. 2014-10-22 15:46:27 +02:00
Marin Jankovski ba76dbc366 Version 7.4.0. v7.4.0 2014-10-22 15:42:43 +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
Marin JankovskiandMarin Jankovski ed00ab7521 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:24:40 +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 ba22e3ae58 Merge branch 'stable-fix-ldap-check' into '7-4-stable' 
Fix ldap check [stable]

Fix ldap check for stable branch

See merge request !1208
 2014-10-22 09:56:59 +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
Dmitriy Zaporozhets 4c034142a1 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:46 +03:00
Dmitriy Zaporozhets 37e09858e8 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:33 +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