Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7585 from bbodenmiller/patch-11 | Robert Schilling | 2014-08-23 | 1 | -2/+8 |
|\ | | | | | clarify which configs should be updated | ||||
| * | clarify which configs should be updated | Ben Bodenmiller | 2014-08-23 | 1 | -2/+8 |
| | | |||||
* | | remove prerelease note from 6.0 to 7.2 guide | Ben Bodenmiller | 2014-08-23 | 1 | -2/+0 |
|/ | |||||
* | Merge pull request #7576 from bbodenmiller/patch-5 | Robert Schilling | 2014-08-23 | 1 | -8/+9 |
|\ | | | | | [Documentation] cleanup installation guide formatting | ||||
| * | cleanup installation guide formatting | Ben Bodenmiller | 2014-08-22 | 1 | -8/+9 |
| | | | | | | | | | | * Fix some formatting issues * Make capitalization of titles consistent * Update image that shows how to select branch | ||||
* | | gitlab 7.2 requires gitlab shell 1.9.7 | Ben Bodenmiller | 2014-08-22 | 1 | -1/+1 |
|/ | |||||
* | We have 7.2 now :metal: | Robert Schilling | 2014-08-22 | 1 | -2/+2 |
| | |||||
* | update upgrader documentation to mention dependencies | Job van der Voort | 2014-08-22 | 1 | -0/+2 |
| | |||||
* | Remove backticks in markdown links that cause ugly code blocks in GitLab. | Sytse Sijbrandij | 2014-08-21 | 19 | -19/+19 |
| | |||||
* | Swap is required on servers with 1GB RAM | Jacob Vosmaer | 2014-08-21 | 1 | -7/+7 |
| | |||||
* | Merge branch 'doc/update/cmake' into 'master' | Marin Jankovski | 2014-08-21 | 2 | -5/+17 |
|\ | | | | | | | | | | | Add installing cmake to 7.2 update docs See merge request !1029 | ||||
| * | 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 | ||||
| * | | Add dependency info for mysql-postgresql converter | xvonabur | 2014-08-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge pull request #7436 from bbodenmiller/patch-3 | Jacob Vosmaer | 2014-08-21 | 2 | -17/+83 |
|\ \ \ | |_|/ |/| | | upgrade ruby and gitlab shell config during 6.0->7.1 & 6.0->7.2 upgrades | ||||
| * | | update ruby & gitlab shell config | Ben Bodenmiller | 2014-08-20 | 2 | -17/+83 |
| | | | | | | | | | | | | ruby 2.0.x required for gitlab 7.0+ | ||||
* | | | Merge branch 'explain_migration' into 'master' | Marin Jankovski | 2014-08-21 | 2 | -0/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Explain label migration See merge request !1025 | ||||
| * | | | Document characters being stripped from labels | Jacob Vosmaer | 2014-08-20 | 2 | -0/+14 |
| | | | | |||||
* | | | | 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 | ||||
| * | | | cmake is required during the installation of the rugged gem | Sameer Naik | 2014-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following error is encountered during the installation of the rugged gem: Gem::Ext::BuildError: ERROR: Failed to build gem native extension. /usr/bin/ruby2.1 extconf.rb checking for cmake... no ERROR: CMake is required to build Rugged. *** extconf.rb failed *** | ||||
* | | | | Merge branch 'label-doc' into 'master' | Jacob Vosmaer | 2014-08-20 | 5 | -0/+17 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Label doc Fixes #1487 See merge request !1028 | ||||
| * | | | 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 |
| | |/ | |/| | |||||
* | | | Mention Google OAuth API change in update guides | Robert Schilling | 2014-08-19 | 2 | -2/+14 |
| | | | | | | | | | | | | Add oauth doc to 6.0 to 7.2 upgrader | ||||
* | | | Update omniauth-google-oauth2 gem | Robert Schilling | 2014-08-19 | 1 | -5/+9 |
|/ / | | | | | | | Udate doc | ||||
* | | Add 6.0-to-7.2.md guide ahead of 7.2 release | Jacob Vosmaer | 2014-08-19 | 1 | -0/+147 |
| | | |||||
* | | Add 7.1-to-7.2.md update guide | Jacob Vosmaer | 2014-08-19 | 1 | -0/+106 |
| | | |||||
* | | Merge pull request #7438 from bbodenmiller/patch-5 | Jeroen van Baarsen | 2014-08-18 | 1 | -0/+3 |
|\ \ | | | | | | | Add dealing with newlines for editor to 5.1-to-6.0 | ||||
| * | | Add dealing with newlines for editor to 5.1-to-6.0 | Ben Bodenmiller | 2014-08-04 | 1 | -0/+3 |
| | | | | | | | | | backport of https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 | ||||
* | | | Merge pull request #7537 from Razer6/rake_tasks_style | Jeroen van Baarsen | 2014-08-18 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | Fix env variable style for documentation | ||||
| * | | | Fix env varable style for documentation | Robert Schilling | 2014-08-18 | 1 | -6/+6 |
| | |/ | |/| | |||||
* | | | Merge pull request #7534 from sue445/feature/add_webhook_doc | Jacob Vosmaer | 2014-08-18 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | Add missing elements to webhook doc | ||||
| * | | Add missing elements to webhook doc | sue445 | 2014-08-19 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #7527 from Razer6/api_labels_return_code | Jacob Vosmaer | 2014-08-18 | 1 | -6/+5 |
|\ \ \ | |/ / |/| | | API: Fix labels return code | ||||
| * | | Fix labels return code | Robert Schilling | 2014-08-18 | 1 | -6/+5 |
| | | | |||||
* | | | Merge pull request #7509 from cirosantilli/fix-md-style-api | Jeroen van Baarsen | 2014-08-15 | 6 | -85/+68 |
|\ \ \ | | | | | | | | | Fix Md style for API. | ||||
| * | | | Fix Md style for API. | Ciro Santilli | 2014-08-15 | 6 | -85/+68 |
| | | | | |||||
* | | | | Merge pull request #7508 from cirosantilli/md-style-projects | Jeroen van Baarsen | 2014-08-15 | 1 | -89/+70 |
|\ \ \ \ | | | | | | | | | | | Fix Md style for projects API doc. | ||||
| * | | | | Fix Md style for projects API doc. | Ciro Santilli | 2014-08-15 | 1 | -89/+70 |
| | |/ / | |/| | | |||||
* | | | | Consistency, spelling and grammar | James Brooks | 2014-08-15 | 6 | -13/+13 |
| | | | | |||||
* | | | | Add labels api authorization. Update permission doc | Dmitriy Zaporozhets | 2014-08-15 | 1 | -0/+1 |
|/ / / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge pull request #7479 from Razer6/feature/labels_api | Dmitriy Zaporozhets | 2014-08-15 | 3 | -26/+86 |
|\ \ \ | | | | | | | | | Implement complete labels API (create/delete/update) | ||||
| * | | | Update labels via API | Robert Schilling | 2014-08-13 | 1 | -1/+23 |
| | | | | |||||
| * | | | Add, delete labels via API | Robert Schilling | 2014-08-13 | 3 | -26/+64 |
| | | | | |||||
* | | | | Merge pull request #7465 from Razer6/better_label_color_validation | Dmitriy Zaporozhets | 2014-08-15 | 2 | -2/+14 |
|\ \ \ \ | |_|/ / |/| | | | Better label color validation, fixes #7454 | ||||
| * | | | Do label validation for issues/merge requests API | Robert Schilling | 2014-08-14 | 2 | -2/+14 |
| |/ / | |||||
* | | | Merge pull request #7475 from bbodenmiller/curl-redirects | Jeroen van Baarsen | 2014-08-13 | 8 | -9/+9 |
|\ \ \ | | | | | | | | | follow curl redirects | ||||
| * | | | follow curl redirects | Ben Bodenmiller | 2014-08-11 | 8 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update `curl` commands to follow redirects (see http://curl.haxx.se/docs/manpage.html#-L). Current `curl` commands will return unexpected results if the requested content has been moved and is returning information about where it has been moved to. Including the `-L` option tells `curl` to follow the redirect so the file can be correctly acquired. | ||||
* | | | | Merge pull request #6788 from CingleVue/master | Dmitriy Zaporozhets | 2014-08-13 | 1 | -3/+6 |
|\ \ \ \ | |_|/ / |/| | | | Patched `MergeRequest` to return more data. | ||||
| * | | | # This is a combination of 2 commits. | mabdullah-cinglevue | 2014-08-01 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # The first commit's message is: Patched `MergeRequest` to return more data. Patched `MergeRequest` to return the `description` & `milestone` Conflicts: lib/api/entities.rb # This is the 2nd commit message: Update merge_requests.md Update documentation for merge request endpoint adding support for description. |