Commit Graph
1348 Commits
Author SHA1 Message Date
Jacob Vosmaer 71a674fd6a Add 6.0-to-7.2.md guide ahead of 7.2 release 2014-08-19 18:20:42 +02:00
Jacob Vosmaer c5e6defd0f Add 7.1-to-7.2.md update guide 2014-08-19 18:20:42 +02:00
Robert SchillingandJacob Vosmaer b9bb647b12 Fix env varable style for documentation 2014-08-19 18:20:42 +02:00
sue445andJacob Vosmaer f324275e40 Add missing elements to webhook doc 2014-08-19 18:20:40 +02:00
Robert SchillingandJacob Vosmaer 33c8c1cc0b Fix labels return code 2014-08-19 18:20:39 +02:00
Ben BodenmillerandJacob Vosmaer 53bed00023 Add dealing with newlines for editor to 5.1-to-6.0
backport of https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1
2014-08-19 18:20:37 +02:00
Jacob Vosmaer 7567614d3b Merge tag 'v7.2.0.rc1'
Bump version to 7.2.0.rc1

Conflicts:
	VERSION
2014-08-18 16:12:32 +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
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
2014-08-15 10:25:23 +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
Ben Bodenmiller 6a412c9969 add application check commands 2014-08-04 12:56:08 -07:00
Jeroen van Baarsen d4f5af820f Merge pull request #7422 from bbodenmiller/rm-gitlab-user
Add command to remove GitLab user
2014-08-04 11:50:30 +02:00
Jeroen van Baarsen ca4ab9efb9 Merge pull request #7424 from bbodenmiller/patch-1
add command to start rails console
2014-08-04 10:44:28 +02:00
Ben Bodenmiller 73bdeff02e add command to start rails console 2014-08-04 00:57:32 -07:00
Ben Bodenmiller 5511bb9f64 Self signed SSL cert not supported until 5.1 2014-08-03 08:42:56 -07:00
Ben Bodenmiller d2ed33224a Remove GitLab user 2014-08-03 08:40:29 -07:00
Jeroen van Baarsen 2600d08f65 Merge pull request #7420 from Razer6/mention_all_markup
[DOC] Mention the @all GFM reference in documentation
2014-08-03 12:20:29 +02:00
Robert Schilling 4b022747f4 Mention the @all GFM reference 2014-08-03 11:56:08 +02:00
Robert Schilling dc8e6de062 Replace invalid emojis 2014-08-03 11:44:37 +02:00
Jeroen van Baarsen 4809cbaef0 Merge pull request #7201 from nacengineer/patch-2
Update 6.9-to-7.0.md
2014-08-02 12:35:39 +02:00
mabdullah-cinglevue 4a36d669b5 # This is a combination of 2 commits.
# 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.
2014-08-01 18:29:23 +08:00
Jeroen van Baarsen ec18f0bae5 Merge pull request #7410 from robbytaylor/patch-1
Text changes to projects API documentation
2014-08-01 08:24:35 +02:00
Rob Taylor 38a692d20b Fixed typos in Development - Rake Tasks doc 2014-07-31 17:55:13 +01:00
Rob Taylor 79d71461c2 Text changes to projects API documentation
Fixes some grammar / punctuation errors and inconsistencies.
2014-07-31 17:39:04 +01:00
Job van der Voort 53f47353c0 add 7.1.1-ee packages 2014-07-29 13:32:18 +02:00
Sasha Joseph 37c4ba6f8d Add an option to GET /projects in the GitLab API to exclude archived projects 2014-07-28 12:48:13 -04:00
Jacob Vosmaer 914275ac0a Add omnibus-gitlab to the monthly release process 2014-07-28 15:11:27 +02:00
Sytse Sijbrandij 7da74468b3 Merge branch 'add-merge-moments-to-process' into 'master'
Add merge moments to process

Fixes #1450

See merge request !986
2014-07-27 15:32:26 +00:00