summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump VERSION to 7.2.1v7.2.1Jacob Vosmaer2014-08-281-1/+1
* Update the CHANGELOG for 7.2.1Jacob Vosmaer2014-08-281-0/+4
* Merge branch 'stable-xss-fix' into '7-2-stable'Jacob Vosmaer2014-08-281-4/+2
|\
| * Prevent possible XSS issues by seting text/plain for all text files inDmitriy Zaporozhets2014-08-281-4/+2
* | Fixes #7571James Brooks2014-08-281-0/+6
|/
* Add pkg-config as required dependency for ruggedRobert Schilling2014-08-264-7/+7
* clarify which configs should be updatedBen Bodenmiller2014-08-231-2/+8
* remove prerelease note from 6.0 to 7.2 guideBen Bodenmiller2014-08-231-2/+0
* gitlab 7.2 requires gitlab shell 1.9.7Ben Bodenmiller2014-08-221-1/+1
* update upgrader documentation to mention dependenciesJob van der Voort2014-08-221-0/+2
* We have 7.2 now :metal:Robert Schilling2014-08-221-2/+2
* Bump VERSION to 7.2.0v7.2.0Jacob Vosmaer2014-08-221-1/+1
* Merge branch 'rack_attack/unsubscribes' into 'master'Jacob Vosmaer2014-08-221-2/+10
|\
| * Create one big regular expresion for Rack::AttackJacob Vosmaer2014-08-221-6/+6
| * Change rack attack example.Marin Jankovski2014-08-221-2/+10
|/
* Merge branch 'backticks-cause-quote' into 'master'Jacob Vosmaer2014-08-2119-19/+19
|\
| * Remove backticks in markdown links that cause ugly code blocks in GitLab.Sytse Sijbrandij2014-08-2119-19/+19
|/
* Merge branch 'doc/memory_recommendations' into 'master'Sytse Sijbrandij2014-08-211-7/+7
|\
| * Swap is required on servers with 1GB RAMJacob Vosmaer2014-08-211-7/+7
|/
* Merge branch 'gitlab_shell_to_1.9.7' into 'master'Jacob Vosmaer2014-08-211-1/+1
|\
| * Bump required gitlab-shell version to 1.9.7Jacob Vosmaer2014-08-211-1/+1
|/
* Merge branch 'doc/update/cmake' into 'master'Marin Jankovski2014-08-212-5/+17
|\
| * Add installing cmake to 7.2 update docsJacob Vosmaer2014-08-212-5/+17
* | Merge pull request #7562 from xvonabur/patch-1Jacob Vosmaer2014-08-211-0/+1
|\ \
| * | Add dependency info for mysql-postgresql converterxvonabur2014-08-211-0/+1
* | | Merge pull request #7436 from bbodenmiller/patch-3Jacob Vosmaer2014-08-212-17/+83
|\ \ \ | |_|/ |/| |
| * | update ruby & gitlab shell configBen Bodenmiller2014-08-202-17/+83
* | | Merge branch 'explain_migration' into 'master'Marin Jankovski2014-08-213-1/+17
|\ \ \
| * | | Document characters being stripped from labelsJacob Vosmaer2014-08-203-1/+17
* | | | Merge branch 'update_changelog' into 'master'Jacob Vosmaer2014-08-211-6/+6
|\ \ \ \
| * | | | Update changelog.Marin Jankovski2014-08-201-6/+6
| |/ / /
* | | | Merge pull request #7540 from sameersbn/docs-install-cmakeJacob Vosmaer2014-08-211-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | cmake is required during the installation of the rugged gemSameer Naik2014-08-191-1/+1
* | | | Merge pull request #7555 from erikjwaxx/masterJacob Vosmaer2014-08-211-1/+1
|\ \ \ \
| * | | | Fix spelling error in merge request performance issue warning.Erik Weatherwax2014-08-201-1/+1
| | |_|/ | |/| |
* | | | Make sure the test fails in year 2114.Marin Jankovski2014-08-211-2/+2
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2014-08-212-11/+13
|\ \ \ \
| * \ \ \ Merge pull request #7557 from Razer6/fix_testsJacob Vosmaer2014-08-212-11/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix tests after #7526Robert Schilling2014-08-202-11/+13
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer2014-08-211-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'fix_labels_edit' into 'master'Jacob Vosmaer2014-08-211-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Call updateColorPreview in Labels constructorRobert Schilling2014-08-201-1/+1
| |/ / /
* | | | Merge branch 'label-doc' into 'master'Jacob Vosmaer2014-08-205-0/+17
|\ \ \ \ | |/ / / |/| | |
| * | | add required permission to label docJob van der Voort2014-08-201-1/+1
| * | | label documentationJob van der Voort2014-08-205-0/+17
| | |/ | |/|
* | | Bump version to 7.2.0.rc5v7.2.0.rc5Jacob Vosmaer2014-08-201-1/+1
* | | Merge branch 'fix_google_oauth_gem' into 'master'Jacob Vosmaer2014-08-204-14/+30
|\ \ \
| * | | Mention Google OAuth API change in update guidesRobert Schilling2014-08-192-2/+14
| * | | Update omniauth-google-oauth2 gemRobert Schilling2014-08-192-12/+16
* | | | Merge pull request #7526 from jubianchi/api/issue-api-validate-labelsJacob Vosmaer2014-08-207-15/+107
|\ \ \ \