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

	Commit message (Collapse)	Author	Age	Files	Lines
*	API: Ability to remove source branchapi-remove-source-branch	Robert Schilling	2016-12-04	1	-2/+6
\|
*	Merge branch 'api-expose-commiter-details' into 'master'	Rémy Coutable	2016-12-04	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose committer details for a commit Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312 See merge request !7849
\| *	API: Expose committer details for a commitapi-expose-commiter-details	Robert Schilling	2016-12-01	1	-0/+1
\| \|
* \|	Allow public access to some Project API endpoints4269-public-api	Rémy Coutable	2016-12-01	2	-10/+23
\|/ \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'api-branch-status' into 'master'	Rémy Coutable	2016-11-30	1	-1/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
\| *	API: Expose branch statusapi-branch-status	Robert Schilling	2016-11-30	1	-1/+5
\| \|
* \|	Merge branch 'grapify-files-api' into 'master'	Rémy Coutable	2016-11-30	1	-93/+60
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
\| * \|	Grapify the files APIgrapify-files-api	Robert Schilling	2016-11-30	1	-93/+60
\| \|/
* \|	Merge branch 'grapify-projects-api' into 'master'	Rémy Coutable	2016-11-30	2	-337/+267
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the projects API Related to #22928 See merge request !7456
\| * \|	Grapify the projects APIgrapify-projects-api	Robert Schilling	2016-11-28	2	-337/+267
\| \|/
* \|	Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipeline	Grzegorz Bizon	2016-11-29	1	-1/+1
\| \|
* \|	Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security'	Douwe Maan	2016-11-28	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace issue access checks with use of IssuableFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR? :warning: - Potentially untested :bomb: - No test coverage :traffic_light: - Test coverage of some sort exists (a test failed when error raised) :vertical_traffic_light: - Test coverage of return value (a test failed when nil used) :white_check_mark: - Permissions check tested ### Issue lookup with access check Using `visible_to_user` likely makes these security issues too. See [Code smells](#code-smells). - [x] :vertical_traffic_light: app/finders/notes_finder.rb:15 [`visible_to_user`] - [x] :traffic_light: app/views/layouts/nav/_project.html.haml:73 [`visible_to_user`] [`.count`] - [x] :white_check_mark: app/services/merge_requests/build_service.rb:84 [`issue.try(:confidential?)`] - [x] :white_check_mark: lib/api/issues.rb:112 [`visible_to_user`] - CHANGELOG: Prevented API returning issues set to 'Only team members' to everyone - [x] :white_check_mark: lib/api/helpers.rb:126 [`can?(current_user, :read_issue, issue)`] Maybe here too? - [x] :white_check_mark: lib/gitlab/search_results.rb:53 [`visible_to_user`] ### Previous discussions - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b2ff264eddf9819d7693c14ae213d941494fe2b3_128_126 - [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#7b6375270d22f880bdcb085e47b519b426a5c6c7_87_87 See merge request !2031
* \|	Merge branch 'zj-fix-label-creation-non-members' into 'security'	Douwe Maan	2016-11-28	3	-61/+37
\|/ \| \| \| \| \| \| \|	Fix label creation non members Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23416 See merge request !2006
*	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 '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>
* \| \|	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
\| \|/ /
* \| \|	Add a starting date to milestonesmilestone_start_date	Valery Sizov	2016-11-23	2	-1/+3
\| \| \|
* \| \|	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
\| \| \|
* \| \|	Avoid helper call with default parametersavoid-api-helper-call	Robert Schilling	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>
* \| \|	Grapify the projects snippet APIgrapify-project-snippet-api	Robert Schilling	2016-11-21	1	-78/+78
\|/ /
* \|	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 'zj-slash-commands-mattermost' into 'master'	Kamil Trzciński	2016-11-18	2	-5/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slash command for mattermost Closes #22540 ## 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) - 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) See merge request !7438
\| * \| \|	Return a consistent not found message	Z.J. van de Weg	2016-11-18	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents leakage of project names on an endpoint which is unauthenticated and thus open to the world.
\| * \| \|	Improve style, add more tests	Z.J. van de Weg	2016-11-18	2	-13/+6
\| \| \| \|
\| * \| \|	More coverage on service level	Z.J. van de Weg	2016-11-18	2	-6/+10
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into zj-slash-commands-mattermost	Z.J. van de Weg	2016-11-17	7	-56/+79
\| \|\ \ \
\| * \| \| \|	More refactoring, push present to base command	Z.J. van de Weg	2016-11-17	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Incorporate feedback, improve presenter class	Z.J. van de Weg	2016-11-17	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Make chat authorization to work [ci skip]	Kamil Trzcinski	2016-11-17	1	-3/+26
\| \| \| \| \|
* \| \| \| \|	Merge branch 'grapify-repository-api' into 'master'	Rémy Coutable	2016-11-18	1	-58/+39
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify repository api See merge request !7534
\| * \| \| \|	Grapify the repository API	Robert Schilling	2016-11-18	1	-58/+39
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sort-api-groups' into 'master'	Sean McGivern	2016-11-17	1	-0/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow sorting groups in API Relates to #20013. See merge request !7529
\| * \| \| \|	Allow sorting groups in APIsort-api-groups	Sean McGivern	2016-11-17	1	-0/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow `order_by` and `sort` parameters to `/api/v3/groups.json`. At present, only ordering by name and path is supported, and the default sort is name ascending (alphabetical order).