home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,871 Commits 48 Branches 340 Tags
6-2-stable
Commit Graph
6871 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets af2ee9b027 Merge branch 'update_ruby_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-23 19:46:23 +00:00
Achilleas Pipinellis 6ea0f4f0ba Update ruby to patchlevel 353 (security update) 
https://www.ruby-lang.org/en/news/2013/11/22/heap-overflow-in-floating-point-parsing-cve-2013-4164/
 2013-11-23 12:39:18 +02:00
Dmitriy Zaporozhets 97155e811d Merge branch 'fix-check' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-21 08:04:35 +00:00
Sytse Sijbrandij 81612a6704 Update check as well. 2013-11-21 08:36:05 +01:00
Dmitriy Zaporozhets ab6b1f28d1 Merge branch 'add-new-gitlab-shell' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-20 11:44:00 +00:00
Sytse Sijbrandij d1865b6d73 Install latest version of GitLab Shell, commit in master did not merge cleanly. 2013-11-20 12:40:45 +01:00
Dmitriy Zaporozhets e48313f709 Merge branch 'api_token_cast' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable v6.2.4 2013-11-14 15:39:51 +00:00
Jacob Vosmaer 3909048279 Use gitlab-shell 1.7.8 2013-11-14 14:01:06 +01:00
Jacob Vosmaer 059f7decd9 Bump version 2013-11-14 13:16:28 +01:00
Dmitriy ZaporozhetsandJacob Vosmaer 62a27f38b5 Make sure private_token for API is a string 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-14 13:14:41 +01:00
Dmitriy Zaporozhets b490fded36 Merge branch 'ldap_block_fix' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-05 15:47:40 +00:00
Dmitriy Zaporozhets 675e5203cc Version 6.2.3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.2.3 		2013-11-04 14:41:30 +02:00
Elias MårtensonandJacob Vosmaer e4e96f2dea When looking up a user by DN, use single scope 
The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.

One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.

This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.
 2013-11-04 09:35:40 +01:00
Dmitriy Zaporozhets a811a4fa0b Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-04 07:07:43 +00:00
Jacob Vosmaer 867785b492 Use gitlab-shell 1.7.4 2013-11-01 16:34:00 +01:00
Dmitriy Zaporozhets 2d56ef52d2 Require gitlab-shell 1.7.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 16:58:59 +02:00
Dmitriy Zaporozhets 33b041a346 Revert "Escape strings" 
This reverts commit 03141bfccc.
 2013-11-01 16:30:29 +02:00
Dmitriy Zaporozhets 9f9d9cff0d Revert "Best to escape strings not split them" 
This reverts commit 1ab324cb67.
 2013-11-01 16:30:18 +02:00
Dmitriy Zaporozhets 31736e9be8 Correctly escape search query 2013-11-01 14:14:33 +02:00
Dmitriy Zaporozhets a476bc7bc7 Shell escape code search 2013-11-01 14:14:24 +02:00
Dmitriy Zaporozhets 1bace9da9a Require gitlab-shell v1.7.3 2013-11-01 14:14:06 +02:00
Nigel KukardandDmitriy Zaporozhets 1ab324cb67 Best to escape strings not split them 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-01 14:13:38 +02:00
Nigel KukardandDmitriy Zaporozhets 03141bfccc Escape strings 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-01 14:13:30 +02:00
Dmitriy Zaporozhets 35068315c1 Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-11-01 12:03:58 +00:00
Jacob Vosmaer 7d0d9c650e Restore sidekiq rake tasks 2013-11-01 12:03:15 +01:00
Dmitriy Zaporozhets 9c3e95f6d9 Version to 6.2.2 v6.2.2 2013-10-31 11:28:25 +02:00
Dmitriy Zaporozhets a4d65885e7 Update gitlab_git to recent version 2013-10-31 11:26:45 +02:00
Dmitriy Zaporozhets f2a77a82b8 Version 6.2.1 v6.2.1 2013-10-28 13:14:29 +02:00
arulandDmitriy Zaporozhets 2f47049ddc Fix for issue #5431 2013-10-25 17:53:08 +03:00
Dmitriy Zaporozhets 5123d706c2 Merge branch '6-2-stable' of github.com:gitlabhq/gitlabhq into 6-2-stable 2013-10-22 14:10:24 +03:00
Dmitriy Zaporozhets f896c2eb60 Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable 2013-10-22 09:11:12 +00:00
Jacob Vosmaer 7dbcc1e660 Use 2>&1 because Bash 3 does not support &>> 2013-10-22 10:31:17 +02:00
Jacob Vosmaer 4f5d905374 Merge pull request #5389 from alexyoder/patch-1 
change 6-1-stable to 6-2-stable in installation guide
 2013-10-21 10:04:32 -07:00
Alex Yoder 08fd2b957d change 6-1-stable to 6-2-stable 2013-10-21 13:00:05 -04:00
Dmitriy Zaporozhets 1a923fe02e Merge branch 'disable_rdoc' of /home/git/repositories/gitlab/gitlabhq v6.2.0 2013-10-21 08:04:33 +00:00
Dmitriy Zaporozhets 4aea30a6b5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-21 10:49:30 +03:00
Jacob Vosmaer af24fe915b Merge pull request #5380 from thestv/patch-1 
corrected the url of the init-script
 2013-10-21 00:22:45 -07:00
Dmitriy Zaporozhets 7210a34bc7 Version up to 6.2.0 2013-10-21 10:05:13 +03:00
Dmitriy Zaporozhets 92b3612025 Improve project_merge_requests.rb feature steps 2013-10-21 09:55:41 +03:00
Dmitriy Zaporozhets 584117aa87 Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq 2013-10-21 06:22:41 +00:00
Dmitriy Zaporozhets 5eadd14953 Merge pull request #5382 from nattster/patch-1 
Use init.d/gitlab script from 6-0-stable branch
 2013-10-20 22:48:14 -07:00
Natt Piyapramote e41f4a8480 Use init.d/gitlab script from 6-0-stable branch 
Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine.

It says:
```
Starting the GitLab Unicorn web server...
/etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found
Starting the GitLab Sidekiq event dispatcher...
/etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found
GitLab is not running.
```
 2013-10-21 09:20:53 +07:00
Stefan Baust 511f666fc4 corrected the url of the init-script 2013-10-20 21:10:51 +02:00
Dmitriy Zaporozhets 9f7757ed24 Fix rspec test after bdd3513f03 2013-10-20 18:29:11 +03:00
Dmitriy Zaporozhets bdd3513f03 Merge pull request #5373 from rtripault/milestone-iid 
Show milestones iid instead of id
 2013-10-20 07:56:45 -07:00
Dmitriy Zaporozhets 131aff76e0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-20 17:55:49 +03:00
Dmitriy Zaporozhets e247a7c9eb Merge pull request #5377 from tsigo/autocomplete_refactor 
Refactor search_autocomplete_source
 2013-10-20 07:53:18 -07:00
Robert Speicher cb9cf077de Refactor and cover search_autocomplete_source 2013-10-20 01:05:20 -04:00
Robert Speicher bb494203d2 Cover the simple_sanitize helper 2013-10-19 23:57:34 -04:00
Romain 53564d9009 A few other iids instead of ids (mostly in edit forms) 2013-10-19 09:23:51 +02:00