1217 Commits
Author SHA1 Message Date
Sytse Sijbrandij eea595971f Remove backticks in markdown links that cause ugly code blocks in GitLab. 2014-08-21 17:25:14 +02:00
Jacob Vosmaer ecd946be4c Swap is required on servers with 1GB RAM 2014-08-21 16:58:06 +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 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
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
Jacob Vosmaer abf917d33d Merge branch 'label-doc' into 'master'
Label doc

Fixes #1487

See merge request !1028
2014-08-20 15:30:59 +00:00
Job van der Voort 2353554ba5 add required permission to label doc 2014-08-20 16:24:17 +02:00
Job van der Voort 4b9a838dc8 label documentation 2014-08-20 14:25:55 +02:00
Jacob Vosmaer 30ba7aea19 Document characters being stripped from labels 2014-08-20 09:56:49 +02:00
Robert Schilling 794a8d8187 Mention Google OAuth API change in update guides
Add oauth doc to 6.0 to 7.2 upgrader
2014-08-19 15:20:57 +02:00
Robert Schilling 3f161a3a3d Update omniauth-google-oauth2 gem
Udate doc
2014-08-19 14:37:51 +02:00
Jacob Vosmaer 0b3ebb6440 Add 6.0-to-7.2.md guide ahead of 7.2 release 2014-08-19 14:24:47 +02:00
Jacob Vosmaer af6842a97d Add 7.1-to-7.2.md update guide 2014-08-19 14:13:16 +02:00
Sameer Naik 18a275f693 cmake is required during the installation of the rugged gem
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 ***
2014-08-19 13:18:14 +05:30
Jeroen van Baarsen e5e3fcaf79 Merge pull request #7438 from bbodenmiller/patch-5
Add dealing with newlines for editor to 5.1-to-6.0
2014-08-18 19:48:27 +02:00
Jeroen van Baarsen e76b1ffde9 Merge pull request #7537 from Razer6/rake_tasks_style
Fix env variable style for documentation
2014-08-18 19:47:57 +02:00
Robert Schilling c0f9abad85 Fix env varable style for documentation 2014-08-18 19:08:46 +02:00
Jacob Vosmaer 1db77dc14b Merge pull request #7534 from sue445/feature/add_webhook_doc
Add missing elements to webhook doc
2014-08-18 17:45:19 +02:00
sue445 911e47a93d Add missing elements to webhook doc 2014-08-19 00:19:05 +09:00
Jacob Vosmaer 6dc24e3bcf Merge pull request #7527 from Razer6/api_labels_return_code
API: Fix labels return code
2014-08-18 17:16:32 +02:00
Robert Schilling 4ca3f64719 Fix labels return code 2014-08-18 00:25:49 +02:00
Jeroen van Baarsen 54c2083703 Merge pull request #7509 from cirosantilli/fix-md-style-api
Fix Md style for API.
2014-08-15 17:14:27 +02:00
Jeroen van Baarsen f05cec53bb Merge pull request #7508 from cirosantilli/md-style-projects
Fix Md style for projects API doc.
2014-08-15 17:14:13 +02:00
James Brooks 3f36f84c1f Consistency, spelling and grammar 2014-08-15 15:03:01 +01:00
Dmitriy Zaporozhets 6063a1e6c1 Add labels api authorization. Update permission doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-15 11:59:19 +03:00
Ciro Santilli a1d0997850 Fix Md style for projects API doc. 2014-08-15 10:52:37 +02:00
Dmitriy Zaporozhets 27cf081e1b Merge pull request #7479 from Razer6/feature/labels_api
Implement complete labels API (create/delete/update)
2014-08-15 10:25:48 +03:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation
Better label color validation, fixes #7454
2014-08-15 10:17:16 +03:00
Ciro Santilli 2ada4ef062 Fix Md style for API. 2014-08-15 09:03:18 +02:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Jeroen van Baarsen 8bce9d7fed Merge pull request #7475 from bbodenmiller/curl-redirects
follow curl redirects
2014-08-13 16:19:57 +02:00
Dmitriy Zaporozhets 71f87ffb66 Merge pull request #6788 from CingleVue/master
Patched `MergeRequest` to return more data.
2014-08-13 16:47:51 +03:00
Robert Schilling cf3ba0209d Update labels via API 2014-08-13 12:29:03 +02:00
Robert Schilling 9284038dbe Add, delete labels via API 2014-08-13 12:28:19 +02:00
Ben Bodenmiller aabb4093b7 follow curl redirects
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.
2014-08-11 22:01:37 -07:00
Dmitriy Zaporozhets 5b52d7b979 Merge branch 'add_complete_commit_message_to_api' of https://gitlab.com/christian.taedcke/gitlab-ce into christian.taedcke/gitlab-ce-add_complete_commit_message_to_api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-08-11 12:33:04 +03:00
Dmitriy Zaporozhets d10ecacc47 Merge branch 'master' into 'master'
Let users limit by archived/not archived projects in GitLab API GET /projects

Adds a boolean parameter, archived, to the /projects endpoint.

See merge request !158
2014-08-11 09:27:24 +00:00
Dmitriy Zaporozhets 9d3e384ae6 Merge branch 'better-formulated-memory-requirements' into 'master'
Better formulated memory requirements

See merge request !1010
2014-08-09 18:02:43 +00:00
Sytse Sijbrandij ab19a966f0 Explain that sidekiq doesn't eat as much ram as some people seem to suspect https://twitter.com/khrogos/status/498062432938782720 2014-08-09 14:21:25 +02:00
Sytse Sijbrandij a52db7831b Ensure that people know you need swap. Raise swap space for 512MB setups. 2014-08-09 11:19:19 +02:00
Jacob Vosmaer c0e1312567 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-07 17:19:23 +02:00
Jeroen van Baarsen f02d9eb254 Merge pull request #7434 from Razer6/fix_spelling_error
Fix spelling errors in documentation
2014-08-07 10:29:40 +02:00
Robert Schilling abdc442648 Fix spelling errors in doc, closes #7437
Further changes
2014-08-07 10:27:54 +02:00
Sytse Sijbrandij 43f560b174 Add comments. 2014-08-06 17:44:57 +02:00
Jacob Vosmaer aa5e663f85 List API file edit failure conditions in docs 2014-08-06 14:28:22 +02:00