home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,293 Commits 48 Branches 340 Tags
v7.4.4
Commit Graph
12293 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer 04dd845240 Bump VERSION to 7.4.4 v7.4.4 2014-11-19 13:57:05 +01:00
Jacob Vosmaer cd828a651b Merge branch '7-4-stable-sanitize' into '7-4-stable' 
Sanitize fixes

See merge request !1264
 2014-11-19 12:56:02 +00:00
Marin JankovskiandJacob Vosmaer 3a58cc15ad Sanitize branch name and ref name 
Conflicts:
	app/controllers/projects/branches_controller.rb
 2014-11-19 12:26:54 +01:00
Marin JankovskiandJacob Vosmaer 9fb4724e3f Add branch controller test. 2014-11-19 12:25:38 +01:00
Marin JankovskiandJacob Vosmaer 1d53d9c7b1 Clean the string with commit author and email. 2014-11-19 12:25:06 +01:00
Dmitriy Zaporozhets 85a9feabd6 Merge branch '7-4-stable' of github.com:gitlabhq/gitlabhq into 7-4-stable 2014-10-30 16:40:34 +02:00
Dmitriy Zaporozhets 353a987578 Add addressable explicitly to Gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v7.4.3 		2014-10-30 14:45:15 +02:00
Valery Sizov d52a5c7608 update changelog 2014-10-29 16:51:57 +02:00
Dmitriy ZaporozhetsandValery Sizov 9de385435d Explicitly require addressable gem feature you need. Fixes Buildbox CI integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-29 16:49:09 +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
Robert Schilling 55cf3a5b1a Merge pull request #8162 from jmsche/patch-1 
Fixed missing end-of-code line in 7.4 upgrade doc
 2014-10-25 09:55:28 +02:00
jmsche 5c74abb590 Fixed missing end-of-code line in 7.4 upgrade doc 2014-10-24 22:00:21 +02: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 7f97a1277d internal snippets: fix exposing of title 2014-10-24 19:39:14 +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 ba76dbc366 Version 7.4.0. v7.4.0 2014-10-22 15:42: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 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 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 be80837a69 Update Guide: Change path to nginx config 2014-10-21 19:12:52 +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 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
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +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