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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rc-improve-members-destroy-service' into 'master'	Robert Speicher	2016-10-04	3	-15/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improve `Members::DestroyService` Part of #21979. See merge request !6267
\| *	Fix a few things after the initial improvment to Members::DestroyService	Rémy Coutable	2016-10-03	3	-5/+7
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Improve Members::DestroyService	Rémy Coutable	2016-10-03	3	-14/+6
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolation	Robert Speicher	2016-10-03	1	-1/+1
\|/
*	Merge branch 'fix/import-export-admin' into 'master'	Robert Speicher	2016-10-03	1	-5/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Import/Export for non-admin users Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21315 Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 and https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !6080
\| *	Enable import/export back for non-adminsfix/import-export-admin	James Lopez	2016-10-03	1	-5/+0
\| \|
* \|	Add a /wip slash command	Thomas Balthazar	2016-10-03	1	-1/+1
\|/ \| \| \|	It toggles the 'WIP' prefix in the MR title.
*	Merge branch '21744-fix-missing-values-in-linter' into 'master'	Rémy Coutable	2016-09-30	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add missing values to linter (`only`, `except`) and add new one `Environment` Closes #21744 See merge request !6276
\| *	Expose jobs to view	Katarzyna Kobierska	2016-09-30	1	-0/+1
\| \|
* \|	Merge branch 'close-merge-request-if-open-without-source-project' into 'master'	Rémy Coutable	2016-09-30	1	-5/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Before rendering `show` template we close open merge request without source project. This way there is no need to render `invalid` template. I think that it's better solution than !6383 See merge request !6478
\| * \|	Change callback	Katarzyna Kobierska	2016-09-30	1	-1/+1
\| \| \|
\| * \|	Callback close_merge_request_without_source_project	Katarzyna Kobierska	2016-09-30	1	-7/+8
\| \| \|
\| * \|	Improve grammar	Katarzyna Kobierska	2016-09-30	1	-1/+1
\| \| \|
\| * \|	Close merge request if open without source project	Katarzyna Kobierska	2016-09-30	1	-2/+4
\| \|/
* \|	Small improvements thanks to Robert's feedback	Rémy Coutable	2016-09-30	2	-3/+3
\|/ \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'mr_api_todo_close' into 'master'	Rémy Coutable	2016-09-30	1	-2/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes todos for a merge request when the MR is accepted via the API by the MR assignee. ## Are there points in the code the reviewer needs to double check? Please review refresh service test changes to see if they are correct - I think in those cases, the todos should actually be cleared instead of left pending. ## Why was this MR needed? To make the API behavior consistent with the UI behavior (accepting your own MRs closes the todo item and prevents them from piling up). Closes #22477 See merge request !6486
\| *	Close todos when accepting a MR via the API.	Tony Gambone	2016-09-29	1	-2/+0
\| \|
* \|	Merge branch 'rc-new-access-requests-finder' into 'master'	Douwe Maan	2016-09-30	4	-4/+4
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New `AccessRequestsFinder` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6268
\| *	New AccessRequestsFinder	Rémy Coutable	2016-09-28	4	-4/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	fix broken repo 500 errors in UI and added relevant specs	James Lopez	2016-09-29	1	-1/+6
\| \|
* \|	Add Pipelines for Commit	Kamil Trzcinski	2016-09-27	1	-8/+9
\|/
*	Merge branch 'includes-projects-to-render-issue-notes' into 'master'	Yorick Peterse	2016-09-27	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix IssuesController#show degradation including project on loaded notes See merge request !6540
\| *	Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notes	Paco Guzman	2016-09-27	1	-1/+1
\| \|
* \|	Be nice to Docker Clients talking to JWT/auth	Kamil Trzcinski	2016-09-27	1	-5/+16
\|/
*	Merge branch 'dz-profile-organization' into 'master'	Dmitriy Zaporozhets	2016-09-27	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add organization field to the user profile ## What does this MR do? Add organization field to the user profile ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So we can let users fill organization information separately ## Screenshots (if relevant) ![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[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 - [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 you do - 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/21903 See merge request !6526
\| *	Add organization field to user profile	Dmitriy Zaporozhets	2016-09-27	1	-1/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'rc-new-members-approve-request-access-service' into 'master'	Douwe Maan	2016-09-27	1	-6/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New `Members::ApproveAccessRequestService` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6266
\| *	Ensure Members::ApproveAccessRequestService can fin a requester by ID	Rémy Coutable	2016-09-22	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	New Members::ApproveAccessRequestService	Rémy Coutable	2016-09-22	1	-6/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Fix snippets pagination22500-can-t-paginate-through-snippets	Rémy Coutable	2016-09-26	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'search-filters-label-fix' into 'master'	Jacob Schatz	2016-09-23	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed search dropdown labels not displaying ## What does this MR do? Returns the search controller method after finding the project & group. ## Why was this MR needed? The search controller was returning early when the search term was empty causing a bug where the dropdown toggles wouldn't show the correct text - instead defaulting to `Any`. ## Screenshots (if relevant) ![Screen_Shot_2016-09-09_at_12.09.57](/uploads/8c6bb36f4e163312314611d2877d5fa4/Screen_Shot_2016-09-09_at_12.09.57.png) ## What are the relevant issue numbers? Closes #21783 See merge request !6277
\| * \|	Fixed search dropdown labels not displayingsearch-filters-label-fix	Phil Hughes	2016-09-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would only happen when the search term was empty because the method was returning before the controller could find the group or project for the toggle Closes #21783
* \| \|	Revert part of "Merge branch 'update_issues_mr_counter' into 'master'	Rémy Coutable	2016-09-22	5	-20/+0
\| \|/ \|/\| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'and-you-get-awards' into 'master'	Rémy Coutable	2016-09-21	3	-3/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And Snippets get awards ## What does this MR do? Makes snippets more awesome, by making them awardables ## Why was this MR needed? Because Snippets were left behind. ## What are the relevant issue numbers? Closes #17878 See merge request !4456
\| * \|	Start Frontend work, fix routing problem	Z.J. van de Weg	2016-09-19	2	-2/+5
\| \| \|
\| * \|	Snippets get award emoji! :thumbsup:	Z.J. van de Weg	2016-09-19	2	-2/+9
\| \| \|
* \| \|	Merge branch 'post-merge-improve-of-ci-permissions' into 'master'	Rémy Coutable	2016-09-21	2	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post-merge improve of CI permissions Improves code from !6409 See merge request !6432
\| * \| \|	Improve JwtController implementationpost-merge-improve-of-ci-permissions	Kamil Trzcinski	2016-09-20	1	-3/+3
\| \| \| \|
\| * \| \|	Post-merge improve of CI permissions	Kamil Trzcinski	2016-09-20	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch '21170-cycle-analytics' into 'master'	Stan Hu	2016-09-21	1	-0/+67
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cycle Analytics: first iteration ## What does this MR do? - Implement the first iteration of the "Cycle Analytics" feature. ## What are the relevant issue numbers? - Closes #21170 ## Screenshots ![cycle_analytics_screencast.gif](/uploads/d23c3c912caa6935fd47b53ca3a56b97/cycle_analytics.gif) ## Backend Tasks - [x] Implementation - [x] Phases - [x] Issue (Tracker) - [x] Plan (Board) - [x] Code (IDE) - [x] Test (CI) - [x] Review (MR) - [x] Staging (CD) - [x] Production (Total) - [x] Make heuristics more modular - [x] Scope to project - [x] Date range (30 days, 90 days) - [x] Access restriction - [x] Test - [x] Find a better way to test these phases - [x] Phases - [x] Issue (Tracker) - [x] Plan (Board) - [x] Code (IDE) - [x] Test (CI) - [x] Review (MR) - [x] Staging (CD) - [x] Production (Total) - [x] Test for "end case happens before start case" - [x] Consolidate helper - [x] Miniboss review - [x] Performance testing with mock data - [x] Improve performance - [x] Pre-calculate "merge requests closing issues - [x] Pre-calculate everything else - [x] Test performance against 10k issues - [x] Test all pre-calculation code - [x] Ci::Pipeline -> build start/finish - [x] Ci::Pipeline#merge_requests - [x] Issue -> record default metrics after save - [x] MergeRequest -> record default metrics after save - [x] Deployment -> Update "first_deployed_to_production_at" for MR metrics - [x] Git Push -> Update "first commit mention" for issue metrics - [x] Merge request create/update/refresh -> Update "merge requests closing issues" - [x] Remove `MergeRequestsClosingIssues` when necessary - [x] Changes to unblock Fatih - [x] Add summary data - [x] `stats` should be array - [x] Let `stats` be `null` if all `stats` are null - [x] Indexes for "merge requests closing issues" - [x] Test summary data - [x] Scope everything to project - [x] Find out why tests were passing - [x] Filter should include issues/MRs which have made it to production within the range - [x] Don't create duplicate `MergeRequestsClosingIssues` - [x] Fix tests - [x] MySQL median - [x] Assign to Douwe for review - [x] Fix conflicts - [x] Implement suggestions from Yorick's review - [x] Test on PG - [x] Test on MySQL - [x] Refactor - [x] Cleanup - [x] What happens if we have no data at all? - [x] Extract common queries to methods / scopes - [x] Remove unused queries - [x] Downtime for foreign key migrations - [x] Find a way around "if issue.metrics.present?" all over the place - [x] Find a way around "if merge_request.metrics.present?" all over the place - [x] Test migrations on a fresh database - [x] MySQL - [x] Pg - [x] Access issues - While the project is public and the visibility is set to "Everyone with access", you cannot visit the cycle analytics page when signed out. - [x] CHANGELOG - [x] Implement suggestions from Douwe's review - [x] First set of comments - [x] Second set of comments - [x] Third set of comments - [x] Fourth set of comments - [x] Make sure build is green - [ ] Make issue for "polish" - [ ] EE MR See merge request !5986
\| * \| \| \|	Implement fourth round of comments from @DouweM.	Timothy Andrew	2016-09-21	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Pluralize summary titles - Remove the `run_query` method - always return sql strings from the `date_time_sql` methods
\| * \| \| \|	Move JSON generation (cycle analytics) into a controller method.	Timothy Andrew	2016-09-20	1	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Helper methods are meant for views
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics	Timothy Andrew	2016-09-20	16	-108/+176
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Move cycle analytics JSON generation to a helper.	Timothy Andrew	2016-09-17	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Use a new format, with each stage having a `title`, `description`, and `value.
\| * \| \| \|	Add a JSON version of the `CycleAnalytics` page.	Timothy Andrew	2016-09-08	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into 21170-cycle-analytics	Timothy Andrew	2016-09-07	23	-80/+121
\| \|\ \ \ \
\| * \| \| \| \|	Authorize access to cycle analytics.	Timothy Andrew	2016-08-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All users with "Reporter" access (and above) to a project can see the Cycle Analytics page.
\| * \| \| \| \|	Fetch cycle analytics data for a specific date range.	Timothy Andrew	2016-08-26	1	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Supported date ranges are 30 / 90 days ago. The default is 90 days ago. 2. All issues created before "x days ago" are filtered out, even if they have other related data (test runs, merge requests) within the filter range.
\| * \| \| \| \|	Scope Cycle Analytics queries to a project	Timothy Andrew	2016-08-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add the "Plan" Cycle Analytics query.	Timothy Andrew	2016-08-26	1	-28/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Move from raw SQL to ActiveRecord. 2. Add a non-persisted `CycleAnalytics` model to store all the queries.