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

	Commit message (Collapse)	Author	Age	Files	Lines
*	WIP: Add tests and make sure that headers are set21698-redis-runner-last-build	Lin Jen-Shin	2017-01-04	5	-5/+76
\| \| \| \| \| \| \| \| \| \|	* We realized that headers were not set whenever we give 204 because `render_api_error!` doesn't preserve the headers. * We also realized that `update_runner_info` would be called in POST /builds/register every time therefore runner is updated every time, ticking the queue, making this last_update didn't work very well, and the test would be failing due to that.
*	Fixed broken build	Kim "BKC" Carlbäcker	2016-12-21	2	-2/+2
\|
*	Change name of expire constant	Kim "BKC" Carlbäcker	2016-12-16	1	-3/+3
\|
*	Make expire-time a constant, correct function in Service	Kim "BKC" Carlbäcker	2016-12-16	2	-3/+4
\|
*	Use Token instead of ID	Kim "BKC" Carlbäcker	2016-12-16	1	-1/+1
\|
*	Do things in the correct order	Kim "BKC" Carlbäcker	2016-12-16	2	-1/+3
\|
*	Don't use redis.multi	Kim "BKC" Carlbäcker	2016-12-16	1	-9/+3
\|
*	Make ensure_runner_queue_value atomic	Kim "BKC" Carlbäcker	2016-12-16	1	-5/+7
\|
*	#NamingThings	Kim "BKC" Carlbäcker	2016-12-16	4	-16/+21
\|
*	Update Runners in a Service	Kim "BKC" Carlbäcker	2016-12-15	2	-15/+13
\|
*	Move redis-logic into Ci::Runner	Kim "BKC" Carlbäcker	2016-12-15	3	-12/+19
\|
*	linting	Kim "BKC" Carlbäcker	2016-12-15	2	-3/+3
\|
*	Use correct variables	Kim "BKC" Carlbäcker	2016-12-14	1	-1/+1
\|
*	typo-o	Kim "BKC" Carlbäcker	2016-12-14	2	-2/+2
\|
*	This is needed as well...	Kim "BKC" Carlbäcker	2016-12-14	1	-1/+8
\|
*	Add BuildQueueWorker for injecting redis-keys	Kim "BKC" Carlbäcker	2016-12-14	3	-0/+25
\|
*	First attempt	Kim "BKC" Carlbäcker	2016-12-14	2	-0/+20
\|
*	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>
* \|	Merge branch 'process-commit-worker-migration-encoding' into 'master'	Rémy Coutable	2016-12-14	3	-7/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-7/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-4/+46
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-24/+19
\| \| \|
\| * \|	Changes after review	Filipa Lacerda	2016-12-07	3	-13/+11
\| \| \| \| \| \| \| \| \| \| \| \|	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	4	-2/+33
\| \| \| \| \| \| \| \| \| \| \| \|	Updates changelog with MR ID
* \| \|	Merge branch '20052-actions-table-vscroll' into 'master'	Annabel Dunstone Gray	2016-12-13	3	-13/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent overflow with vertical scroll when we have space to show content ## What does this MR do? Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens. ## Screenshots (if relevant) ![scroll](/uploads/6b9e3584df6e4ca29553d2ff576b794e/scroll.jpg) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 #20052 See merge request !8061
\| * \| \|	Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscroll	Filipa Lacerda	2016-12-13	3	-13/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds changelog
* \| \| \|	Merge branch 'backport/group-policies' into 'master'	Rémy Coutable	2016-12-13	2	-0/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport hooks on group policies for the EE-specific implementation See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/822#note_19955431 See merge request !8066
\| * \| \| \|	Backport hooks on group policies for the EE-specific implementationbackport/group-policies	Douglas Barbosa Alexandre	2016-12-13	2	-0/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'api-cherry-pick' into 'master'	Rémy Coutable	2016-12-13	4	-1/+148
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-1/+148
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master'	Rémy Coutable	2016-12-13	3	-2/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-2/+7
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	7	-113/+149
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-32/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-96/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
* \| \| \| \| \|	Merge branch 'move-admin-settings-feature-to-rspec' into 'master'	Rémy Coutable	2016-12-13	3	-57/+25
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
\| * \| \| \| \| \|	Move admin settings spinach feature to rspec	jurre	2016-12-13	3	-57/+25
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'api-simple-group-project' into 'master'	Rémy Coutable	2016-12-13	4	-9/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060
\| * \| \| \| \| \| \|	API: Ability to get group's project in simple representationapi-simple-group-project	Robert Schilling	2016-12-13	4	-9/+32
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dz-create-routes-lower-index' into 'master'	Dmitriy Zaporozhets	2016-12-13	3	-1/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index to routes table on lower path for postgresql Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !8041
\| * \| \| \| \| \| \| \|	Add AddLowerPathIndexToRoutes to setup_postgresql.rake	Dmitriy Zaporozhets	2016-12-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Add index to routes table on lower path for postgresqldz-create-routes-lower-index	Dmitriy Zaporozhets	2016-12-12	2	-1/+23
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'allow-more-filenames' into 'master'	Rémy Coutable	2016-12-13	3	-2/+50
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
\| * \| \| \| \| \| \| \|	Allow all alphanumeric characters in file names (!8002)	winniehell	2016-12-13	2	-2/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add failing test for #20190	winniehell	2016-12-13	1	-0/+44
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '25518-uniquely-style-labels' into 'master'	Fatih Acet	2016-12-13	3	-1/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added border-radius and padding to labels ## What does this MR do? It creates a pill like style for labels. ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? get a unique label look/style ## Screenshots (if relevant) ![image](/uploads/2cf347984ae4e36cd061c5a761ee99c9/image.png) ![image](/uploads/c23bbeba4b2525b4f36dac5a0fa1037c/image.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25518 See merge request !8054
\| * \| \| \| \| \| \| \|	added border-radius and padding to labels25518-uniquely-style-labels	Dimitrie Hoekstra	2016-12-13	3	-1/+4
\| \| \| \| \| \| \| \| \|