Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-22Change location and refactor issue closing pattern documentationAchilleas Pipinellis
Split into user and administrator docs: - administration/issue_closing_pattern.md - user/project/issues/automatic_issue_closing.md [ci skip]
2016-09-21Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2016-09-21Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable
Post-merge improve of CI permissions Improves code from !6409 See merge request !6432
2016-09-21Merge branch 'cs-upgrade-sidekiq' into 'master' Robert Speicher
Upgrade Sidekiq to 4.2.1, remove dependency on Sinatra This updates Sidekiq to 4.2.1, which adds full support for Rails 5 by removing a dependency on Sinatra which was one of the remaining Rails 5 blockers. Major things to check: Sidekiq still works, obviously. Also that the Web UI/Admin dashboard works and doesn't lose any functionality (based on my testing it works fine). Working toward #14286. Changelog: https://github.com/mperham/sidekiq/blob/921e939f995fbb5238975d4121d728b95be99ab5/Changes.md#421 See merge request !6349
2016-09-21Merge branch '21170-cycle-analytics' into 'master' Stan Hu
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
2016-09-21Implement fourth round of comments from @DouweM.Timothy Andrew
- Pluralize summary titles - Remove the `run_query` method - always return sql strings from the `date_time_sql` methods
2016-09-21Fix `CreateDeploymentService` spec.Timothy Andrew
1. The spec tests that if: - The merge request is merged - The target branch is deployed to production - The `first_deployed_to_production_at` metric is `nil` (for some reason) - The target branch is deployed to production again - The `first_deployed_to_production_at` metric stays as `nil` (and is not overwritten). 2. Failure only on MySQL due to some datetime weirdness.
2016-09-21Reload issues in spec to ensure label<->issue mapping properly loadedStan Hu
2016-09-21Fix build.Timothy Andrew
2016-09-21Remove unnecessary #{} in cycle analytics template.Fatih Acet
2016-09-21Update cycle analytics icon and fix color of the dismiss button.Fatih Acet
2016-09-21Use triple dashes for the empty value in cycle analytics.Fatih Acet
2016-09-21Fix typo on cycle analytics copy.Fatih Acet
2016-09-21Add page title and fix sub menu width in Cycle Analytics page.Fatih Acet
2016-09-21Update Cycle Analytics Read more link URL.Fatih Acet
2016-09-21Display the cycle analytics navbar based on the `:read_cycle_analytics` ability.Timothy Andrew
2016-09-20Improve indentation in `Gitlab::Database::Median`Timothy Andrew
2016-09-20Add a spec for merge request metric caching while refreshing a merge request ↵Timothy Andrew
from a forked project.
2016-09-20Use the `IssuableBaseService` lifecycle hooks to cache ↵Timothy Andrew
`MergeRequestsClosingIssues` - Instead of overriding `create` and `update` in `MergeRequests::BaseService` - Get all merge request service specs passing
2016-09-20Merge branch 'issue_20078' into 'master' Yorick Peterse
Test if issue authors can access private projects See merge request !6419
2016-09-20Implement a second round of review comments from @DouweM.Timothy Andrew
- Don't use `TableReferences` - using `.arel_table` is shorter! - Move some database-related code to `Gitlab::Database` - Remove the `MergeRequest#issues_closed` and `Issue#closed_by_merge_requests` associations. They were either shadowing or were too similar to existing methods. They are not being used anywhere, so it's better to remove them to reduce confusion. - Use Rails 3-style validations - Index for `MergeRequest::Metrics#first_deployed_to_production_at` - Only include `CycleAnalyticsHelpers::TestGeneration` for specs that need it. - Other minor refactorings.
2016-09-20Merge branch 'doc/cycle-analytics' into 'master' Achilleas Pipinellis
Add docs on Cycle Analytics Document Cycle Analytics first iteration https://gitlab.com/gitlab-org/gitlab-ce/issues/21170 See merge request !6437
2016-09-20Merge branch 'slash-commands-load-fix' into 'master' Robert Speicher
Fixed slash commands not loading ## What does this MR do? Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed. ## What are the relevant issue numbers? Closes #21774, #21807 See merge request !6207
2016-09-20Add docs on Cycle AnalyticsAchilleas Pipinellis
[ci skip]
2016-09-20Test if issue authors can access private projectsFelipe Artur
2016-09-20Improve JwtController implementationKamil Trzcinski
2016-09-20Merge branch 'update_issues_mr_counter' into 'master' Rémy Coutable
Fix issues with wrong issues/merge request counts when filters are selected Closes #15356 plus counter for issues and MR are now displayed for the these paths `https://gitlab.com/groups/group-name/issues` `https://gitlab.com/groups/group-name/merge_requests` `https://gitlab.com/dashboard/issues` and `https://gitlab.com/dashboard/merge_requests` See merge request !4960
2016-09-20Merge branch 'JonTheNiceGuy/gitlab-ce-Ubuntu-16.04-Package'Rémy Coutable
See gitlab-org/gitlab-ce!6247.
2016-09-20Update .pkgr.yml with Ubuntu 16.04 dependenciesJon "The Nice Guy" Spriggs
2016-09-20Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable
Add optional 'author' param when making commits This fulfills https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 by adding the ability to specify a user's ID to be used as the author of a commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 See merge request !5822
2016-09-20Post-merge improve of CI permissionsKamil Trzcinski
2016-09-20Merge branch '22218-fix-note-form-footer' into 'master' Robert Speicher
Fix note form hint showing slash commands supported for commits ## What are the relevant issue numbers? Closes #22218 See merge request !6368
2016-09-20fix issues mr counterbarthc
2016-09-20Merge branch 'fix-regression-in-handling-build-updated' into 'master' Rémy Coutable
Fix processing of events when build finished. Update pipeline after processing builds. Otherwise we can get into scenario where pipeline will be marked as running. This solves a quite significant regression in Pipeline processing. Proper fix is to move all this to Sidekiq Worker and process pipeline there. I'll do it after 8.12 release. See merge request !6410
2016-09-20Move JSON generation (cycle analytics) into a controller method.Timothy Andrew
Helper methods are meant for views
2016-09-20Add CHANGELOG entry.Timothy Andrew
2016-09-20Merge branch 'order-stages-by-pipeline' into 'master' Rémy Coutable
Render stages in valid order Currently stages in stages dropdown on builds page are not in valid order. It is important to display stages in other those are defined in the pipeline. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21133 See merge request !6430
2016-09-20Fix rubocop spec.Timothy Andrew
And `scss_lint`
2016-09-20Implement (some) comments from @DouweM's review.Timothy Andrew
- Move things common to `Issue` and `MergeRequest` into `Issuable` - Move more database-specific functions into `Gitlab::Database` - Indentation changes and other minor refactorings.
2016-09-20Render stages in valid orderKamil Trzcinski
2016-09-20Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable
Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
2016-09-20Add a view spec for projects/notes/_formRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-20Ensure we have a user before checking for their permission in ↵Rémy Coutable
Notes::SlashCommandsService Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-20Fix note form hint showing slash commands supported for commitsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-20Merge branch '22364-rails-cache-redis-connection-pool' into 'master' Yorick Peterse
Use a ConnectionPool for Rails.cache on Sidekiq servers See merge request !6429
2016-09-20Merge branch 'merge-request-push-compare-ui' into 'master' Jacob Schatz
Frontend for Merge Request Diff This merge request improves the UX for the merge request diff feature which was recently implemented here (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127). Specifically, it styles various parts of the diff feature to match the designs, it disables comment-related buttons in states where comments are disabled, and it adds a 'Show latest version' button for convenience. ## Are there points in the code the reviewer needs to double check? I could use feedback on this MR's fidelity to the design. ## Why was this MR needed? Neccessary styling improvements for basic UX of this feature, and enabled comment buttons are not functional and thus need to be disabled in certain states. ## Screenshots (if relevant) ![57dd0755f0b14342305909](/uploads/318a44a3bc8b7fc5c9c6ef92ba92e511/57dd0755f0b14342305909.gif) ## 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 - [ ] 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/21427 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127 cc: @jschatz1 See merge request !6343
2016-09-20Merge branch 'maxiperezc/gitlab-ce-issues_17198' into 'master' Douwe Maan
Fix "Unsubscribe" link in notification emails that is triggered by anti-virus ## What does this MR do? * The unsubscribe link in an email body only unsubscribes automatically when logged in, otherwise the user is asked for a confirmation. * The unsubscribe link in an email header unsubscribes automatically whether logged in or not. ## Are there points in the code the reviewer needs to double check? This addresses all the comments from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5241, I think! ## Why was this MR needed? People were getting unsubscribed automatically by AV software. ## Screenshot ![Screen_Shot_2016-09-20_at_09.51.30](/uploads/083ee2865f1ad6c08e2ed97f1c4e7d0d/Screen_Shot_2016-09-20_at_09.51.30.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] 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? Fixes #17198. See merge request !6223
2016-09-20Update schema.rbTimothy Andrew
2016-09-20Fix spec failures.Timothy Andrew
2016-09-20add missing spaceJames Lopez