Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump VERSION to 7.2.0v7.2.0 | Jacob Vosmaer | 2014-08-22 | 1 | -1/+1 |
* | Merge branch 'rack_attack/unsubscribes' into 'master' | Jacob Vosmaer | 2014-08-22 | 1 | -2/+10 |
|\ | |||||
| * | Create one big regular expresion for Rack::Attack | Jacob Vosmaer | 2014-08-22 | 1 | -6/+6 |
| * | Change rack attack example. | Marin Jankovski | 2014-08-22 | 1 | -2/+10 |
|/ | |||||
* | Merge branch 'backticks-cause-quote' into 'master' | Jacob Vosmaer | 2014-08-21 | 19 | -19/+19 |
|\ | |||||
| * | Remove backticks in markdown links that cause ugly code blocks in GitLab. | Sytse Sijbrandij | 2014-08-21 | 19 | -19/+19 |
|/ | |||||
* | Merge branch 'doc/memory_recommendations' into 'master' | Sytse Sijbrandij | 2014-08-21 | 1 | -7/+7 |
|\ | |||||
| * | Swap is required on servers with 1GB RAM | Jacob Vosmaer | 2014-08-21 | 1 | -7/+7 |
|/ | |||||
* | Merge branch 'gitlab_shell_to_1.9.7' into 'master' | Jacob Vosmaer | 2014-08-21 | 1 | -1/+1 |
|\ | |||||
| * | Bump required gitlab-shell version to 1.9.7 | Jacob Vosmaer | 2014-08-21 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'doc/update/cmake' into 'master' | Marin Jankovski | 2014-08-21 | 2 | -5/+17 |
|\ | |||||
| * | Add installing cmake to 7.2 update docs | Jacob Vosmaer | 2014-08-21 | 2 | -5/+17 |
* | | Merge pull request #7562 from xvonabur/patch-1 | Jacob Vosmaer | 2014-08-21 | 1 | -0/+1 |
|\ \ | |||||
| * | | Add dependency info for mysql-postgresql converter | xvonabur | 2014-08-21 | 1 | -0/+1 |
* | | | Merge pull request #7436 from bbodenmiller/patch-3 | Jacob Vosmaer | 2014-08-21 | 2 | -17/+83 |
|\ \ \ | |_|/ |/| | | |||||
| * | | update ruby & gitlab shell config | Ben Bodenmiller | 2014-08-20 | 2 | -17/+83 |
* | | | Merge branch 'explain_migration' into 'master' | Marin Jankovski | 2014-08-21 | 3 | -1/+17 |
|\ \ \ | |||||
| * | | | Document characters being stripped from labels | Jacob Vosmaer | 2014-08-20 | 3 | -1/+17 |
* | | | | Merge branch 'update_changelog' into 'master' | Jacob Vosmaer | 2014-08-21 | 1 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Update changelog. | Marin Jankovski | 2014-08-20 | 1 | -6/+6 |
| |/ / / | |||||
* | | | | Merge pull request #7540 from sameersbn/docs-install-cmake | Jacob Vosmaer | 2014-08-21 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | cmake is required during the installation of the rugged gem | Sameer Naik | 2014-08-19 | 1 | -1/+1 |
* | | | | Merge pull request #7555 from erikjwaxx/master | Jacob Vosmaer | 2014-08-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix spelling error in merge request performance issue warning. | Erik Weatherwax | 2014-08-20 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Make sure the test fails in year 2114. | Marin Jankovski | 2014-08-21 | 1 | -2/+2 |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Jacob Vosmaer | 2014-08-21 | 2 | -11/+13 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #7557 from Razer6/fix_tests | Jacob Vosmaer | 2014-08-21 | 2 | -11/+13 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix tests after #7526 | Robert Schilling | 2014-08-20 | 2 | -11/+13 |
| |/ / / | |||||
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Jacob Vosmaer | 2014-08-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'fix_labels_edit' into 'master' | Jacob Vosmaer | 2014-08-21 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Call updateColorPreview in Labels constructor | Robert Schilling | 2014-08-20 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'label-doc' into 'master' | Jacob Vosmaer | 2014-08-20 | 5 | -0/+17 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | add required permission to label doc | Job van der Voort | 2014-08-20 | 1 | -1/+1 |
| * | | | label documentation | Job van der Voort | 2014-08-20 | 5 | -0/+17 |
| | |/ | |/| | |||||
* | | | Bump version to 7.2.0.rc5v7.2.0.rc5 | Jacob Vosmaer | 2014-08-20 | 1 | -1/+1 |
* | | | Merge branch 'fix_google_oauth_gem' into 'master' | Jacob Vosmaer | 2014-08-20 | 4 | -14/+30 |
|\ \ \ | |||||
| * | | | Mention Google OAuth API change in update guides | Robert Schilling | 2014-08-19 | 2 | -2/+14 |
| * | | | Update omniauth-google-oauth2 gem | Robert Schilling | 2014-08-19 | 2 | -12/+16 |
* | | | | Merge pull request #7526 from jubianchi/api/issue-api-validate-labels | Jacob Vosmaer | 2014-08-20 | 7 | -15/+107 |
|\ \ \ \ | |||||
| * | | | | Add spec on labels validation | jubianchi | 2014-08-20 | 1 | -0/+23 |
| * | | | | Improve labels validation and expose error messages | jubianchi | 2014-08-20 | 6 | -15/+84 |
| | |/ / | |/| | | |||||
* | | | | Bump version to 7.2.0.rc4v7.2.0.rc4 | Jacob Vosmaer | 2014-08-20 | 1 | -1/+1 |
* | | | | Merge pull request #7553 from Razer6/fix_project_descriptionv7.2.0.rc3 | Jacob Vosmaer | 2014-08-20 | 2 | -20/+25 |
|\ \ \ \ | |||||
| * | | | | Restyle explore projects to fix #7548 | Robert Schilling | 2014-08-20 | 2 | -20/+25 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #7552 from Razer6/fix_star_button | Jacob Vosmaer | 2014-08-20 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | use default white-space for sidebar buttons, fixes #7549 | Robert Schilling | 2014-08-19 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #7536 from yuters/patch-5 | Jacob Vosmaer | 2014-08-20 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix color toggle for labels in edit view | Martin Bastien | 2014-08-18 | 1 | -1/+1 |
* | | | | Bump version to 7.2.0.rc2v7.2.0.rc2 | Jacob Vosmaer | 2014-08-19 | 1 | -1/+1 |
* | | | | Merge branch 'fix_label_migration' into 'master' | Jacob Vosmaer | 2014-08-19 | 1 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | |