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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'refresh-authorizations-with-lease' into 'master'	Douwe Maan	2016-11-28	1	-7/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Refresh project authorizations using a Redis lease This MR changes `User#refresh_authorized_projects` so it uses a Redis lease instead of relying on serializable transactions. See the commit message(s) for more details. See merge request !7733
\| *	Refresh project authorizations using a Redis leaserefresh-authorizations-with-lease	Yorick Peterse	2016-11-25	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When I proposed using serializable transactions I was hoping we would be able to refresh data of individual users concurrently. Unfortunately upon closer inspection it was revealed this was not the case. This could result in a lot of queries failing due to serialization errors, overloading the database in the process (given enough workers trying to update the target table). To work around this we're now using a Redis lease that is cancelled upon completion. This ensures we can update the data of different users concurrently without overloading the database. The code will try to obtain the lease until it succeeds, waiting at least 1 second between retries. This is necessary as we may otherwise end up _not_ updating the data which is not an option.
* \|	Merge branch 'zj-expose-coverage-pipelines' into 'master'	Rémy Coutable	2016-11-25	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
\| * \|	Expose coverage on GET pipelines/:idzj-expose-coverage-pipelines	Z.J. van de Weg	2016-11-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The coverage wasn't exposed yet, now it is but only for detailed requests to save queries on the database.
* \| \|	Merge branch 'timeout-merge-request-for-binary-file' into 'master'	Yorick Peterse	2016-11-25	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Timeout creating and viewing merge request for binary file See merge request !7713
\| * \| \|	Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-file	Valery Sizov	2016-11-25	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'zj-slash-commands-improvements' into 'master' 24769-make-mattermost-command-easier-to-configure	Kamil Trzciński	2016-11-25	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slash commands improvements See merge request !7638
\| * \| \| \|	Accept a valid ref for issue show	Z.J. van de Weg	2016-11-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For example, now we support `/gitlab issue show #1`. Where the # used to trip the regex.
* \| \| \| \|	Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master'	Yorick Peterse	2016-11-25	7	-12/+28
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Reduce queries in API::Helpers#find_project" See merge request !7714
\| * \| \| \|	API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_project	Rémy Coutable	2016-11-24	4	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	API: Introduce `#find_project!` which also check access permission	Rémy Coutable	2016-11-24	2	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	API: Use `#find_project` in API::Triggers and API::Services	Rémy Coutable	2016-11-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Make API::Helpers find a project with only one query	Rémy Coutable	2016-11-24	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'api-no-convert' into 'master'	Rémy Coutable	2016-11-24	4	-4/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't convert data which already is the target type With Grape's DSL we already enforce data types. We don't need to explicitly convert to string if there is already one. See merge request !7740
\| * \| \| \|	Don't convert data which already is the target typeapi-no-convert	Robert Schilling	2016-11-24	4	-4/+4
\| \|/ / /
* \| \| \|	Merge branch 'dz-allow-nested-group-routing' into 'master'	Douwe Maan	2016-11-24	5	-37/+37
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459
\| * \| \| \|	Add nested groups support to the routingdz-allow-nested-group-routing	Dmitriy Zaporozhets	2016-11-23	5	-37/+37
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Use Commit#author so we share logic and cache	Lin Jen-Shin	2016-11-24	1	-4/+2
\| \|/ / \|/\| \| \| \| \| \| \| \|	Closes #24900
* \| \|	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
\| \|/ / / /