delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix rubucop offensesbitbucket-oauth2	Douglas Barbosa Alexandre	2016-12-16	1	-1/+0
\|
*	BB importer: Milestone importer	Valery Sizov	2016-12-16	1	-0/+6
\|
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2	Valery Sizov	2016-12-14	36	-100/+859
\|\
\| *	Merge branch '24927-custom-event-polyfill-test' into 'master'	Alfredo Sumaran	2016-12-14	1	-0/+43
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds tests for Custom Event polyfill ## What does this MR do? Adds tests for CustomEvent polyfill. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24927 See merge request !7996
\| \| *	Fix broken test in chrome24927-custom-event-polyfill-test	Filipa Lacerda	2016-12-13	1	-3/+3
\| \| \|
\| \| *	Fix broken test	Filipa Lacerda	2016-12-09	1	-3/+3
\| \| \|
\| \| *	Adds tests for Custom Event polyfill	Filipa Lacerda	2016-12-08	1	-0/+43
\| \| \| \| \| \| \| \| \| \| \| \|	Update changelog with MR ID
\| * \|	Merge branch 'master' into 'dz-remove-namespaces-path-uniq'	Dmitriy Zaporozhets	2016-12-14	64	-268/+1625
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013 # Conflicts: # db/schema.rb
\| \| * \	Merge branch 'dz-fix-admin-routes' into 'master'	Sean McGivern	2016-12-14	4	-6/+18
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for nested groups to admin routing See merge request !8008
\| \| \| * \|	Add support for nested groups to admin routingdz-fix-admin-routes	Dmitriy Zaporozhets	2016-12-11	4	-6/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Merge branch 'build-statuses' into 'master'	Rémy Coutable	2016-12-14	28	-86/+795
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
\| \| \| * \| \|	Improve build status specs contexts descriptions	Grzegorz Bizon	2016-12-14	4	-4/+4
\| \| \| \| \| \|
\| \| \| * \| \|	Add some missing tests for detailed status methodsbuild-statuses	Grzegorz Bizon	2016-12-14	3	-2/+32
\| \| \| \| \| \|
\| \| \| * \| \|	Make it possible to mix `Gitlab::Routing` in	Grzegorz Bizon	2016-12-13	1	-0/+23
\| \| \| \| \| \|
\| \| \| * \| \|	Extract abilities checking module from ability model	Grzegorz Bizon	2016-12-13	1	-0/+27
\| \| \| \| \| \|
\| \| \| * \| \|	Extend tests for pipeline detailed status helpers	Grzegorz Bizon	2016-12-13	1	-12/+18
\| \| \| \| \| \|
\| \| \| * \| \|	Add tests for common build detailed status helpers	Grzegorz Bizon	2016-12-13	1	-0/+37
\| \| \| \| \| \|
\| \| \| * \| \|	Add missing tests for build `cancelable?` method	Grzegorz Bizon	2016-12-13	1	-0/+36
\| \| \| \| \| \|
\| \| \| * \| \|	Add tests for detailed build statuses factory	Grzegorz Bizon	2016-12-13	1	-0/+141
\| \| \| \| \| \|
\| \| \| * \| \|	Make it possible to retry build that was canceled	Grzegorz Bizon	2016-12-13	1	-0/+8
\| \| \| \| \| \|
\| \| \| * \| \|	Make build retryable only if complete and executed	Grzegorz Bizon	2016-12-13	1	-8/+30
\| \| \| \| \| \|
\| \| \| * \| \|	Add tests for build cancelable/retryable statuses	Grzegorz Bizon	2016-12-13	2	-0/+172
\| \| \| \| \| \|
\| \| \| * \| \|	Extend specs for build play/stop detailed statuses	Grzegorz Bizon	2016-12-13	2	-7/+55
\| \| \| \| \| \|
\| \| \| * \| \|	Refine build stop/play extended status specs	Grzegorz Bizon	2016-12-13	2	-31/+31
\| \| \| \| \| \|
\| \| \| * \| \|	Fix detailed status specs for pipeline stage model	Grzegorz Bizon	2016-12-12	1	-1/+3
\| \| \| \| \| \|
\| \| \| * \| \|	Fix pipeline specs for detailed statuses	Grzegorz Bizon	2016-12-12	1	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| \| * \| \|	Add specs for build stop extended detailed status	Grzegorz Bizon	2016-12-12	1	-0/+59
\| \| \| \| \| \|
\| \| \| * \| \|	Add tests for build play extended detailed status	Grzegorz Bizon	2016-12-12	2	-3/+69
\| \| \| \| \| \|
\| \| \| * \| \|	Fix some detailed statuses specs related to abilities	Grzegorz Bizon	2016-12-12	7	-17/+41
\| \| \| \| \| \|
\| \| \| * \| \|	Fix tests related to detailed statuses and permissions	Grzegorz Bizon	2016-12-12	14	-41/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \|	Merge branch '25651-fix-master' into 'master'	Rémy Coutable	2016-12-14	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong error message expectation in API::Commits spec See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation. Closes #25651 See merge request !8083
\| \| \| * \| \| \|	Fix wrong error message expectation in API::Commits spec25651-fix-master	Rémy Coutable	2016-12-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was because the MR was a bit behind master and the error message got updated in the meantime by 79aad815. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Modify namespace name and path validationdz-remove-namespaces-path-uniq	Dmitriy Zaporozhets	2016-12-12	2	-7/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently namespace name and path have uniq validaiton which does not allow us to use same group name/path inside different groups. This commit changes validation in next way: * Allow same namespace name with different parent_id * Allow same namespace path. Uniq validation should be handled by routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	BB importer: fix specs	Valery Sizov	2016-12-14	6	-12/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2	Valery Sizov	2016-12-14	233	-1747/+6220
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'process-commit-worker-migration-encoding' into 'master'	Rémy Coutable	2016-12-14	1	-2/+25
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode when migrating ProcessCommitWorker jobs ## What does this MR do? This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/25489 See merge request !8064
\| \| * \| \| \| \|	Encode when migrating ProcessCommitWorker jobsprocess-commit-worker-migration-encoding	Yorick Peterse	2016-12-13	1	-2/+25
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the source encoding is not UTF-8 we need to encode the data as `JSON.dump` may throw an error if the input can not be converted to UTF-8. We only encode when necessary to reduce the overhead. Fixes gitlab-org/gitlab-ce#25489
\| * \| \| \| \|	Merge branch '25136-last-deployment-link' into 'master'	Grzegorz Bizon	2016-12-14	1	-0/+37
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839
\| \| * \| \| \|	Changes after review25136-last-deployment-link	Filipa Lacerda	2016-12-07	1	-17/+14
\| \| \| \| \| \|
\| \| * \| \| \|	Changes after review	Filipa Lacerda	2016-12-07	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error
\| \| * \| \| \|	Updates tests	Filipa Lacerda	2016-12-07	1	-12/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests Fix rubocop error Fix broken test
\| \| * \| \| \|	Fix broken link for latest deployment	Filipa Lacerda	2016-12-07	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates changelog with MR ID
\| * \| \| \| \|	Merge branch 'api-cherry-pick' into 'master'	Rémy Coutable	2016-12-13	1	-0/+70
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047
\| \| * \| \| \| \|	Make rubocop happyapi-cherry-pick	Robert Schilling	2016-12-13	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	API: Ability to cherry-pick a commit	Robert Schilling	2016-12-13	1	-0/+70
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master'	Rémy Coutable	2016-12-13	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For single line Git commit messages, the close quote should be on the same line as the open quote _Originally opened at !7299 by @jzinn._ - - - ## What does this MR do? Chomps merge commit messages so that there is not a dangling close quote. A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color. ## Screenshots (if relevant) ![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png) See merge request !7975
\| \| * \| \| \| \|	For single line git commit messages, the close quote should be on the same ↵jzinn/gitlab-ce-chomp-git-status-message	Julian Zinn	2016-12-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	line as the open quote Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Merge branch '25482-fix-api-sudo' into 'master'	Sean McGivern	2016-12-13	3	-55/+68
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017
\| \| * \| \| \| \| \|	Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudo	Rémy Coutable	2016-12-13	2	-13/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \|	API: Memoize the current_user so that the sudo can work properly	Rémy Coutable	2016-12-12	2	-42/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The issue was arising when `#current_user` was called a second time after a user was impersonated: the `User#is_admin?` check would be performed on it and it would fail. Signed-off-by: Rémy Coutable <remy@rymai.me>