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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Don't convert data which already is the target typeapi-no-convert	Robert Schilling	2016-11-24	4	-4/+4
\|
*	Merge branch 'api-delete-group-share' into 'master'	Rémy Coutable	2016-11-23	1	-0/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Add endpoint to delete a group share Closes #24771 See merge request !7662
\| *	API: Add endpoint to delete a group shareapi-delete-group-share	Robert Schilling	2016-11-23	1	-0/+13
\| \|
* \|	Merge branch 'grapify-sidekiq-metric-api' into 'master'	Rémy Coutable	2016-11-23	1	-32/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the sidekiq metrics API Related to #22928 See merge request !7699
\| * \|	Grapify the sidekiq metrics API	Robert Schilling	2016-11-23	1	-32/+4
\| \|/
* \|	Merge branch 'milestone_start_date' into 'master'	Sean McGivern	2016-11-23	2	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
\| * \|	Add a starting date to milestonesmilestone_start_date	Valery Sizov	2016-11-23	2	-1/+3
\| \| \|
* \| \|	Merge branch 'post_receive-any-email' into 'master'	Sean McGivern	2016-11-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	post_receive: accept any user email from last commit See merge request !7225
\| * \| \|	post_receive: accept any user email from last commit	Elan Ruusamäe	2016-11-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master'	Rémy Coutable	2016-11-23	1	-2/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Ensure we sanitize branch names with path-unfriendly characters See merge request !7696
\| * \| \|	Ensure we sanitize branch names with path-unfriendly characters	Rémy Coutable	2016-11-23	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'fix/cycle-analytics-plan-issue' into 'master'	Douwe Maan	2016-11-23	2	-1/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cycle analytics plan stage when commits are missing Takes into account when commits are `nil` so the app doesn't throw an exception and also removes them. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24836 - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7694
\| * \| \|	Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issue	James Lopez	2016-11-23	2	-1/+3
\| \| \| \|
* \| \| \|	Merge branch 'zj-fix-trailing-whitespace-issue-create' into 'master'	Kamil Trzciński	2016-11-22	1	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue creation now accepts trailing whitespace See merge request !7633
\| * \| \| \|	Issue creation now accepts trailing whitespacezj-fix-trailing-whitespace-issue-create	Z.J. van de Weg	2016-11-22	1	-2/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix-api-iid-filter' into 'master'	Rémy Coutable	2016-11-22	2	-6/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix IID filter for merge requests and milestones I updated the example in the docs and added a test. The milestones API was also broken for the same reason. Related to !7358 and !7373 See merge request !7648
\| * \| \| \|	Fix IID filter for merge requests and milestones	Robert Schilling	2016-11-22	2	-6/+4
\| \|/ / /
* \| \| \|	Merge branch ↵	Rémy Coutable	2016-11-22	7	-12/+42
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'23532-define-common-helper-for-describe-pagination-params-in-api' into 'master' Add concern for reuse pagination params declaration in API Closes #23532 See merge request !7646
\| * \| \|	Define common helper for describe pagination params in api	Semyon Pupkov	2016-11-22	7	-12/+42
\| \| \| \|
* \| \| \|	Merge branch 'avoid-api-helper-call' into 'master'	Rémy Coutable	2016-11-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid helper call with default parameters The helpers can ultimately be removed when the issue API uses the Grape DSL. See merge request !7649
\| * \| \| \|	Avoid helper call with default parametersavoid-api-helper-call	Robert Schilling	2016-11-22	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix/ci-linter-undefined-error' into 'master'	Kamil Trzciński	2016-11-22	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
\| * \| \|	Fix entry lookup in CI config inheritance rules	Grzegorz Bizon	2016-11-22	1	-1/+1
\| \|/ /
* \| \|	Merge branch '24730-broken-master' into 'master'	Robert Speicher	2016-11-22	1	-4/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix StrongAttibutes error with Ruby 2.1 Closes #24730 See merge request !7625
\| * \| \|	Fix StrongAttibutes error with Ruby 2.124730-broken-master	Rémy Coutable	2016-11-21	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'improve-deploy-message' into 'master'	Kamil Trzciński	2016-11-21	2	-2/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve deploy message ## What does this MR do? Improves deploy message to make it more descriptive and useable then what is already offered by deploy command. ## 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? See merge request !7629
\| * \| \| \|	Improve deploy command message	Kamil Trzcinski	2016-11-21	2	-2/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dz-fix-500-group-git' into 'master'	Sean McGivern	2016-11-21	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when group name ends with git Closes https://gitlab.com/gitlab-com/support-forum/issues/1298 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742 See merge request !7630
\| * \| \| \| \|	Fix 500 error when group name ends with git	Dmitriy Zaporozhets	2016-11-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'chatops-deploy-command' into 'master'	Rémy Coutable	2016-11-21	4	-13/+72
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add deploy chat command This adds a new ChatOps command: ``` /trigger deploy <environment> to <environment> ``` See merge request !7619
\| * \| \| \| \|	Fix specs and improve code readability	Kamil Trzcinski	2016-11-21	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Introduce deploy command that allows to start deployment from one ↵chatops-deploy-command	Kamil Trzcinski	2016-11-21	2	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	environment to second one
\| * \| \| \| \|	Add deploy chat command [ci skip]	Kamil Trzcinski	2016-11-21	3	-13/+61
\| \|/ / / /
* \| \| \| \|	Merge branch 'feature/send-registry-address-with-build-payload' into 'master'	Kamil Trzciński	2016-11-21	4	-0/+70
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send registry address with build payload ## What does this MR do? Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build. ## Are there points in the code the reviewer needs to double check? Change in `lib/ci/api/entities.rb`. ## Why was this MR needed? This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE. ## Screenshots (if relevant) ## 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) - [x] API support added - Tests - [x] 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? Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434 See merge request !7474
\| * \| \| \| \|	Add Gitlab::Ci::Build::Credentials module with build credentials abstraction	Tomasz Maczukin	2016-11-21	4	-16/+64
\| \| \| \| \| \|
\| * \| \| \| \|	Send credentials array with build data	Tomasz Maczukin	2016-11-21	2	-3/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Send registry_url with build data to GitLab Runner	Tomasz Maczukin	2016-11-16	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'grapify-project-snippet-api' into 'master'	Rémy Coutable	2016-11-21	1	-78/+78
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the projects snippet API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7621
\| * \| \| \| \| \|	Grapify the projects snippet APIgrapify-project-snippet-api	Robert Schilling	2016-11-21	1	-78/+78
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'smarter-cache-invalidation' into 'master'	Sean McGivern	2016-11-21	1	-0/+63
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Smarter cache invalidation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 See merge request !7360
\| * \| \| \| \| \|	Unify detecting of special repository files	Yorick Peterse	2016-11-21	1	-0/+63
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves the logic of detecting special repository files (e.g. a README or a Koding configuration file) to a single class: Gitlab::FileDetector. Moving this logic into a single place allows this to be re-used more easily. This commit also changes Repository#gitlab_ci_yaml so that its cached similar to other data (e.g. the Koding configuration file).
* \| \| \| \| \|	Merge branch 'fix/cycle-analytics-permissions' into 'master'	Sean McGivern	2016-11-21	1	-0/+44
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added permissions per stage to cycle analytics endpoint See merge request !7613
\| * \| \| \| \|	refactored a couple of things based on feedbackfix/cycle-analytics-permissions	James Lopez	2016-11-21	1	-12/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Added permissions per stage to cycle analytics endpoint	James Lopez	2016-11-21	1	-0/+49
\| \|/ / / /
* \| \| \| \|	Merge branch 'grapify-users-api' into 'master'	Rémy Coutable	2016-11-21	1	-257/+249
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
\| * \| \| \|	Grapify the users APIgrapify-users-api	Robert Schilling	2016-11-21	1	-258/+250
\| \| \| \| \|
* \| \| \| \|	Merge branch 'create-pipeline-endpoint' into 'master'	Rémy Coutable	2016-11-21	1	-0/+21
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
\| * \| \| \|	Add api endpoint for creating a pipeline	Ido Leibovich	2016-11-18	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
* \| \| \| \|	Merge branch 'fix/require-build-script-configuration-entry' into 'master' issues-copy	Kamil Trzciński	2016-11-19	3	-24/+51
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make job script a required configuration entry ## What does this MR do? This MR makes a job script a required configuration entry. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #24575 See merge request !7566
\| * \| \| \| \|	Remove CI config helper with same name as an entry	Grzegorz Bizon	2016-11-18	2	-8/+35
\| \| \| \| \| \|