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
11,144 Commits 48 Branches 340 Tags
7-2-stable
Commit Graph
11144 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patricio Cano 9d6d1723c8 Version 7.2.3 v7.2.3 2015-01-09 10:47:49 -05:00
Dmitriy Zaporozhets 0cbc6d11e8 Merge branch '7-2-gitlab-git-update' into '7-2-stable' 
Bump gitlab_git version to 6.2.2

We need to bump the `gitlab_git` version for 7-2-stable to 6.2.2 so that it includes the 0.21.2 version of rugged.

QA Tests have been performed to warrant compatibility.

/cc @jacobvosmaer @job

See merge request !1366
 2015-01-06 17:02:19 +00:00
Patricio Cano 05d60e31d8 Updated CHANGELOG to show changes for Version 7.2.2 2015-01-06 10:41:56 -05:00
Patricio Cano f495f5a907 Updated gitlab_git to 6.2.2 to include rugged 0.21.2 2015-01-05 10:13:48 -05:00
Marin Jankovski e8c2c624c3 Merge pull request #7810 from bbodenmiller/patch-27 
update gitlab shell to 1.9.8 for gitlab 7.2.2
 2014-09-22 10:01:49 +02:00
Ben Bodenmiller 28174236a7 update gitlab shell to 1.9.8 for gitlab 7.2.2 
As committed in https://github.com/gitlabhq/gitlabhq/commit/873acfd9aa54e801d5786c32b05c4f8ad21af72a GitLab 7.2.2 requires GitLab Shell 1.9.8. Related to https://github.com/gitlabhq/gitlabhq/pull/7806 & https://github.com/gitlabhq/gitlabhq/pull/7809.
 2014-09-21 03:51:22 -07:00
Marin Jankovski 3a4ad05c46 Version to 7.2.2 v7.2.2 2014-09-19 09:01:23 +02:00
Marin Jankovski d1be585ab5 Merge branch 'fix_rake_gitlab_check' into '7-2-stable' 
Check for hooks directory symlink in gitlab:check

See merge request !1098
 2014-09-18 12:18:36 +00:00
Jacob Vosmaer a497e89fb9 Check for hooks directory symlink in gitlab:check 
Conflicts:
	lib/tasks/gitlab/check.rake
 2014-09-18 14:08:00 +02:00
Dmitriy Zaporozhets 3fc5795bfb Revert "Rename migration" 
This reverts commit d38df04078.
 2014-09-18 11:00:40 +03:00
Dmitriy Zaporozhets d38df04078 Rename migration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 10:14:14 +03:00
Dmitriy Zaporozhets 873acfd9aa Bump gitlab-shell 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 10:14:06 +03:00
Dmitriy Zaporozhets 73d61d6807 Merge branch 'hooks_migration_skipper' into '7-2-stable' 
Hooks migration skipper

See merge request !1093
 2014-09-18 07:12:58 +00:00
Jacob Vosmaer 236592521e Add rake gitlab:migrate:shell_hooks 2014-09-16 14:23:12 +02:00
Jacob Vosmaer ff1633f418 Bump VERSION to 7.2.1 v7.2.1 2014-08-28 15:11:00 +02:00
Jacob Vosmaer d15944694e Update the CHANGELOG for 7.2.1 2014-08-28 15:10:43 +02:00
Jacob Vosmaer aad45011b3 Merge branch 'stable-xss-fix' into '7-2-stable' 
Stable xss fix

See merge request !1048
 2014-08-28 13:09:11 +00:00
James BrooksandJacob Vosmaer dc42aae3b2 Fixes #7571 2014-08-28 15:07:16 +02:00
Dmitriy Zaporozhets ac24a5a336 Prevent possible XSS issues by seting text/plain for all text files in 
RAW feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 15:59:17 +03:00
Robert Schilling a044c4b14a Add pkg-config as required dependency for rugged 2014-08-26 06:16:05 +02:00
Ben BodenmillerandRobert Schilling 935ed64bc0 clarify which configs should be updated 2014-08-23 12:14:22 +02:00
Ben BodenmillerandRobert Schilling e4f6025d29 remove prerelease note from 6.0 to 7.2 guide 2014-08-23 12:14:03 +02:00
Ben BodenmillerandRobert Schilling ce6767c9e8 gitlab 7.2 requires gitlab shell 1.9.7 2014-08-22 23:10:04 +02:00
Job van der VoortandSytse Sijbrandij 01f82f120c update upgrader documentation to mention dependencies 2014-08-22 21:48:00 +02:00
Robert SchillingandSytse Sijbrandij 0fe5c5ec82 We have 7.2 now 🤘 2014-08-22 21:47:51 +02:00
Jacob Vosmaer da5d33e13e Bump VERSION to 7.2.0 v7.2.0 2014-08-22 13:28:23 +02:00
Jacob Vosmaer abda2dab43 Merge branch 'rack_attack/unsubscribes' into 'master' 
Protect unsubscribe path

See merge request !1033
 2014-08-22 08:00:12 +00:00
Jacob Vosmaer b70606287b Create one big regular expresion for Rack::Attack 2014-08-22 09:56:39 +02:00
Marin JankovskiandJacob Vosmaer 52e903e99f Change rack attack example. 2014-08-22 09:56:39 +02:00
Jacob Vosmaer e328668f29 Merge branch 'backticks-cause-quote' into 'master' 
Backticks cause quote

See merge request !704
 2014-08-21 15:30:35 +00:00
Sytse Sijbrandij eea595971f Remove backticks in markdown links that cause ugly code blocks in GitLab. 2014-08-21 17:25:14 +02:00
Sytse Sijbrandij a83451a5c0 Merge branch 'doc/memory_recommendations' into 'master' 
Swap is required on servers with 1GB RAM

See merge request !1032
 2014-08-21 15:15:31 +00:00
Jacob Vosmaer ecd946be4c Swap is required on servers with 1GB RAM 2014-08-21 16:58:06 +02:00
Jacob Vosmaer 2a53249818 Merge branch 'gitlab_shell_to_1.9.7' into 'master' 
Bump required gitlab-shell version to 1.9.7

See merge request !1031
 2014-08-21 14:45:34 +00:00
Jacob Vosmaer bfaf3a79a9 Bump required gitlab-shell version to 1.9.7 2014-08-21 16:44:39 +02:00
Marin Jankovski 85cf0633fb Merge branch 'doc/update/cmake' into 'master' 
Add installing cmake to 7.2 update docs

See merge request !1029
 2014-08-21 14:31:49 +00:00
Jacob Vosmaer 5a6230b08c Merge pull request #7562 from xvonabur/patch-1 
Add dependency info for mysql-postgresql converter
 2014-08-21 16:21:00 +02:00
Jacob Vosmaer 0d8a4e380b Merge pull request #7436 from bbodenmiller/patch-3 
upgrade ruby and gitlab shell config during 6.0->7.1 & 6.0->7.2 upgrades
 2014-08-21 16:19:47 +02:00
Jacob Vosmaer 274ca09024 Add installing cmake to 7.2 update docs 2014-08-21 13:59:04 +02:00
Marin Jankovski 3ed8fbce2a Merge branch 'explain_migration' into 'master' 
Explain label migration

See merge request !1025
 2014-08-21 11:56:06 +00:00
Jacob Vosmaer df54f86816 Merge branch 'update_changelog' into 'master' 
Update changelog

Fixes #1509

See merge request !1026
 2014-08-21 11:52:24 +00:00
Jacob Vosmaer 6040e84bf4 Merge pull request #7540 from sameersbn/docs-install-cmake 
cmake is required during the installation of the rugged gem
 2014-08-21 12:57:01 +02:00
xvonabur 672daff56c Add dependency info for mysql-postgresql converter 
Running converter with Python 2.6.x installed gives the following error:
AttributeError: 'module' object has no attribute 'check_output'

After installing Python 2.7.x everything works fine.
 2014-08-21 14:28:45 +04:00
Jacob Vosmaer f2942ffee0 Merge pull request #7555 from erikjwaxx/master 
Fix spelling error in merge request performance issue warning.
 2014-08-21 11:20:43 +02:00
Marin Jankovski 7f8460159f Make sure the test fails in year 2114. 2014-08-21 10:49:12 +02:00
Jacob Vosmaer b1433228a5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-21 09:56:11 +02:00
Jacob Vosmaer 5f7be64084 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-08-21 09:56:01 +02:00
Jacob Vosmaer 846e2799c5 Merge pull request #7557 from Razer6/fix_tests 
Fix merge request API after #7526
 2014-08-21 09:55:15 +02:00
Jacob Vosmaer 44a210c0bd Merge branch 'fix_labels_edit' into 'master' 
Fix labels preview color when edit

This is related to #515. Parentheses are missing in coffeescript. For this reason, the color preview is not updated when loading the labels edit page.

See merge request !173
 2014-08-21 06:28:13 +00:00
Ben Bodenmiller 0e14fb0525 update ruby & gitlab shell config 
ruby 2.0.x required for gitlab 7.0+
 2014-08-20 20:05:17 -07:00