Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-18Merge branch 'fix_rake_gitlab_check' into '7-2-stable'Marin Jankovski
Check for hooks directory symlink in gitlab:check See merge request !1098
2014-09-18Check for hooks directory symlink in gitlab:checkJacob Vosmaer
Conflicts: lib/tasks/gitlab/check.rake
2014-09-18Revert "Rename migration"Dmitriy Zaporozhets
This reverts commit d38df04078e8de7067a914beb49ed9e30bab73f6.
2014-09-18Rename migrationDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-18Bump gitlab-shellDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-18Merge branch 'hooks_migration_skipper' into '7-2-stable'Dmitriy Zaporozhets
Hooks migration skipper See merge request !1093
2014-09-16Add `rake gitlab:migrate:shell_hooks`Jacob Vosmaer
2014-08-28Bump VERSION to 7.2.1v7.2.1Jacob Vosmaer
2014-08-28Update the CHANGELOG for 7.2.1Jacob Vosmaer
2014-08-28Merge branch 'stable-xss-fix' into '7-2-stable'Jacob Vosmaer
Stable xss fix See merge request !1048
2014-08-28Fixes #7571James Brooks
2014-08-28Prevent possible XSS issues by seting text/plain for all text files inDmitriy Zaporozhets
RAW feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26Add pkg-config as required dependency for ruggedRobert Schilling
2014-08-23clarify which configs should be updatedBen Bodenmiller
2014-08-23remove prerelease note from 6.0 to 7.2 guideBen Bodenmiller
2014-08-23gitlab 7.2 requires gitlab shell 1.9.7Ben Bodenmiller
2014-08-22update upgrader documentation to mention dependenciesJob van der Voort
2014-08-22We have 7.2 now :metal:Robert Schilling
2014-08-22Bump VERSION to 7.2.0v7.2.0Jacob Vosmaer
2014-08-22Merge branch 'rack_attack/unsubscribes' into 'master'Jacob Vosmaer
Protect unsubscribe path See merge request !1033
2014-08-22Create one big regular expresion for Rack::AttackJacob Vosmaer
2014-08-22Change rack attack example.Marin Jankovski
2014-08-21Merge branch 'backticks-cause-quote' into 'master'Jacob Vosmaer
Backticks cause quote See merge request !704
2014-08-21Remove backticks in markdown links that cause ugly code blocks in GitLab.Sytse Sijbrandij
2014-08-21Merge branch 'doc/memory_recommendations' into 'master'Sytse Sijbrandij
Swap is required on servers with 1GB RAM See merge request !1032
2014-08-21Swap is required on servers with 1GB RAMJacob Vosmaer
2014-08-21Merge branch 'gitlab_shell_to_1.9.7' into 'master'Jacob Vosmaer
Bump required gitlab-shell version to 1.9.7 See merge request !1031
2014-08-21Bump required gitlab-shell version to 1.9.7Jacob Vosmaer
2014-08-21Merge branch 'doc/update/cmake' into 'master'Marin Jankovski
Add installing cmake to 7.2 update docs See merge request !1029
2014-08-21Merge pull request #7562 from xvonabur/patch-1Jacob Vosmaer
Add dependency info for mysql-postgresql converter
2014-08-21Merge pull request #7436 from bbodenmiller/patch-3Jacob Vosmaer
upgrade ruby and gitlab shell config during 6.0->7.1 & 6.0->7.2 upgrades
2014-08-21Add installing cmake to 7.2 update docsJacob Vosmaer
2014-08-21Merge branch 'explain_migration' into 'master'Marin Jankovski
Explain label migration See merge request !1025
2014-08-21Merge branch 'update_changelog' into 'master'Jacob Vosmaer
Update changelog Fixes #1509 See merge request !1026
2014-08-21Merge pull request #7540 from sameersbn/docs-install-cmakeJacob Vosmaer
cmake is required during the installation of the rugged gem
2014-08-21Add dependency info for mysql-postgresql converterxvonabur
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-21Merge pull request #7555 from erikjwaxx/masterJacob Vosmaer
Fix spelling error in merge request performance issue warning.
2014-08-21Make sure the test fails in year 2114.Marin Jankovski
2014-08-21Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer
2014-08-21Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer
2014-08-21Merge pull request #7557 from Razer6/fix_testsJacob Vosmaer
Fix merge request API after #7526
2014-08-21Merge branch 'fix_labels_edit' into 'master'Jacob Vosmaer
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-21update ruby & gitlab shell configBen Bodenmiller
ruby 2.0.x required for gitlab 7.0+
2014-08-20Fix tests after #7526Robert Schilling
2014-08-20Fix spelling error in merge request performance issue warning.Erik Weatherwax
2014-08-20Call updateColorPreview in Labels constructorRobert Schilling
2014-08-20Merge branch 'label-doc' into 'master'Jacob Vosmaer
Label doc Fixes #1487 See merge request !1028
2014-08-20Bump version to 7.2.0.rc5v7.2.0.rc5Jacob Vosmaer
2014-08-20Merge branch 'fix_google_oauth_gem' into 'master'Jacob Vosmaer
Update omniauth-google-oauth2 gem #### What does this MR do? This PR updates google omniauth gem. #### Why was this MR needed? This is needed, because google deprecates some API on Sept, 1st. All tests pass, but I still have to ~~test and update documentation in https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/google.md~~ **Contacts API" and "Google+ API need to be enabled** This need to be stated in the update guide (7.1 to 7.2), as well as (6.0 to 7.2) This fixes #512 See merge request !171
2014-08-20add required permission to label docJob van der Voort