home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,669 Commits 48 Branches 340 Tags
eaef332873014047c0bfc7fddd710e90e2c2cd0f
Commit Graph
11669 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer eaef332873 Use the default color when migrating labels 2014-08-19 18:20:43 +02:00
Jacob Vosmaer 169e883118 Remove invalid characters from the label name 2014-08-19 18:20:42 +02:00
Jacob Vosmaer 0920573ec5 Test if the label is valid before creating link 2014-08-19 18:20:42 +02:00
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
Robert SchillingandJacob Vosmaer c191d730f6 Fix minor spelling error 2014-08-19 18:20:38 +02:00
Robert SchillingandJacob Vosmaer dfbe8fa9ab Consistency: Capitalize hex values of sugested colors 2014-08-19 18:20:38 +02:00
Robert SchillingandJacob Vosmaer 549d453d84 Update org-ruby 2014-08-19 18:20:38 +02:00
Robert SchillingandJacob Vosmaer b7cc0ad7d4 Update gemnasium-gitlab-service 2014-08-19 18:20:38 +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
Job van der Voort b33bf0a381 add email feature to changelog 2014-08-19 14:10:15 +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
Jacob Vosmaer 4142754c7f Bump version to 7.2.0.rc1 v7.2.0.rc1 2014-08-18 15:51:30 +02:00
Jacob Vosmaer 48a943e94a Merge branch 'merge_ce_27cf081e1b0b1df166' into 'master' 
Merge CE 27cf081e1b

See merge request !145
 2014-08-18 10:04:30 +00:00
Jacob Vosmaer d6646e9e81 Use the "fix" branch in the MR template spec 2014-08-18 10:38:50 +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
Jeroen van Baarsen 0965b18874 Merge pull request #7510 from jbrooksuk/patch-1 
Fix grammar and spelling
 2014-08-15 17:13:33 +02:00
Jeroen van Baarsen 6fffc20736 Merge pull request #7511 from jbrooksuk/api-docs 
Consistency, spelling and grammar
 2014-08-15 17:09:52 +02:00
Dmitriy Zaporozhets 7763f3b0cf Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-08-15 17:49:22 +03:00
Dmitriy Zaporozhets 86f6f5a96d Merge branch 'redmine-fix' 2014-08-15 17:48:01 +03:00
Job van der Voort 0d9f8494a8 add tests to redmine integration improvement 2014-08-15 16:03:10 +02:00
James Brooks 3f36f84c1f Consistency, spelling and grammar 2014-08-15 15:03:01 +01:00
James Brooks f85dec2838 Fix grammar and spelling 2014-08-15 14:11:15 +01:00
Dmitriy Zaporozhets cb33279a0f Merge branch 'label-permissions' into 'master' 
Label permissions

* Update label permission docs
* Add authorisation to labels via API

See merge request !1020
 2014-08-15 12:25:34 +00:00
Dmitriy Zaporozhets a8d1cbbecc Merge branch 'git_max_size' into 'master' 
Use new git max_size in the settings initializer

This allows us to avoid repeating default max_size setting in the omnibus-gitlab repository.

See merge request !1021
 2014-08-15 10:07:29 +00:00
Jacob Vosmaer ec381a9308 Use new git max_size in the settings initializer 2014-08-15 11:38:32 +02: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 014eff5d8f Merge pull request #7499 from skv-headless/fix-commit-msg 
Fix commit msg
 2014-08-15 10:23:45 +03:00
Dmitriy Zaporozhets 0602c5d027 Change default label color 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-15 10:20:12 +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
Dmitriy Zaporozhets 7120af7251 Merge pull request #7281 from skv-headless/diff-unfold 
unfold commits
 2014-08-15 09:34:12 +03:00
Dmitriy Zaporozhets 45da59daab Mention username option for developers in gitlab.yml 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-14 15:15:48 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
skv fe46500448 gfm and preserve commit message 
for commits#show
 2014-08-14 15:20:34 +04:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Robert Schilling cbc90565b5 Do label validation for issues/merge requests API 2014-08-14 10:17:52 +02:00
Dmitriy Zaporozhets 3d469188a2 Merge branch 'jira_service_logging' into 'master' 
Improve logging for the JIRA issue closing service

See merge request !144
 2014-08-13 18:40:57 +00:00
Dmitriy Zaporozhets fdd8e45075 Merge branch 'remove-remove-label' into 'master' 
Remove labels via ajax

See merge request !1019
 2014-08-13 18:28:52 +00:00
Dmitriy Zaporozhets 1d63464c82 Fix repository archive 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 21:28:22 +03:00
Dmitriy Zaporozhets 540596b7b5 Remove labels with ajax request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:47:03 +03:00
Dmitriy Zaporozhets d8b769ec74 Make default sing-in logo smaller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-13 19:36:00 +03:00
Jacob Vosmaer fa04782a78 Improve logging for the JIRA issue closing service 2014-08-13 17:46:34 +02:00