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-27Merge branch 'resolve-buttons-path' into 'master' Jacob Schatz
Pass the full project path for resolve buttons ## What does this MR do? The full project path is passed from the HTML into the JS rather than the resolve button JS generating the URL based on the the namespaces. @smcgivern @stanhu Do we have anyway of adding tests for installs with relative URLs? ## What are the relevant issue numbers? Closes #21704 See merge request !6129
2016-09-27Merge branch '22525-emoji-dropdown-shows-search-results-label-several-times' ↵Fatih Acet
into 'master' Fixed awards dropdown search text from repeating ## What does this MR do? Thanks @zeiv for this! >This fixes #20463 by adding the .emoji-search class to the "Search results" h5 element. AwardsHandler.prototype.setupSearch() was trying to remove the element before creating a new one, but wasn't because the it was attempting to select it with the .emoji-search class, which wasn't being added. ## Are there points in the code the reviewer needs to double check? >I don't believe so. ## Why was this MR needed? >See #20463 _(and #22525)_ ## Screenshots (if relevant) ![2016-09-23_15.56.04](/uploads/b421400a08b3d9fa32c577e7d8952504/2016-09-23_15.56.04.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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? Closes #22525 See merge request !6498
2016-09-27Added `@zeiv`s changes to fix awards search, including CHANGELOG where he is ↵Luke Bennett
credited
2016-09-26Merge branch 'fl-18932-revoke-button' into 'master' Fatih Acet
Revoke button in Applications Settings underlines on hover ## What does this MR do? Removes the `btn-link` class from the "Revoke" button ## Why was this MR needed? The button was being underlined on hover and it shouldn't. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? fixes #18932 See merge request !6522
2016-09-26Merge branch '22500-can-t-paginate-through-snippets' into 'master' Robert Speicher
Fix snippets pagination ## What are the relevant issue numbers? Closes #22500 See merge request !6500
2016-09-26Updates changelogFilipa Lacerda
2016-09-26Removes class 'btn-link' of Revoke buttonFilipa Lacerda
2016-09-26Merge branch 'robots-snippets' into 'master' Rémy Coutable
Update robots.txt disallow to allow users/groups starting with "s" ## What does this MR do? Update robots.txt "Disallow: /s" line to "Disallow: /s/" ## Why was this MR needed? Currently any Project that is under a username or group name that starts with "s" cannot be indexed because of this disallow line. For example on https://gitlab.com looking at the projects with the most stars there is this project: https://gitlab.com/somerobots/Trident If you do a Google search for "site:gitlab.com Trident", the project comes up but with "A description for this result is not available because of this site's robots.txt" Adding the trailing slash will still disallow all snippet short urls, but start allowing projects where the URI begins with "s" See merge request !6481
2016-09-26Fix snippets paginationRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-26fix changelogJames Lopez
2016-09-26Fixes issue with rails reserved keyword type exporting/importing services. ↵James Lopez
Also fixed CustomIssueTrackerService title setter and added relevant specs.
2016-09-24Fix CHANGELOG.Ruben Davila
2016-09-24Merge branch 'gitlab-ce-milestone-tab-badges' into 'master' Fatih Acet
Milestone tab badges ### What does this MR do? Adds count badges to the tabs on the Milestone page to mirror the Issue page. ### Are there points in the code the reviewer needs to double check? CSS: Padding was added to the `.milestone` element to make expired milestones look good. ### Why was this MR needed? For consistency with other tabs ### What are the relevant issue numbers? Closes #20114 ### Screenshots (if relevant) **Before** <img src="/uploads/1f75853a863a9058ee409916b7ee4057/Screen_Shot_2016-07-22_at_13.22.20.png" width="362"> **After** <img src="/uploads/8a058290850f571db249dd9b23f5138d/Screen_Shot_2016-07-22_at_13.21.58.png" width="303"> ![Screen_Shot_2016-08-23_at_1.42.56_AM](/uploads/b072dc6bdf505b2fce46660beaf0eae7/Screen_Shot_2016-08-23_at_1.42.56_AM.png) ![Screen_Shot_2016-08-23_at_1.43.15_AM](/uploads/e7440bf2aa628aa4dba63863083699c0/Screen_Shot_2016-08-23_at_1.43.15_AM.png) ### Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5946
2016-09-23update robots.txt disallowMatt Harrison
Allows projects in groups starting with "s" while still disallowing the snippets short urls.
2016-09-23Fix the leak mentioned in 504a3b5 by another wayAhmad Sherif
The previous fix introduced another leak; as it made Banzai::Filter::SanitizationFiler#customized? always return false, so we were always appending two elements to HTML::Pipeline::SanitizationFilter::WHITELIST[:elements]. This growth in the elements array would slow the sanitization process over time.
2016-09-23Fix CHANGELOG double-updateRémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-23Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable
2016-09-23Prepare CHANGELOG for 8.12.1 & 8.13.0Rémy Coutable
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-23Update CHANGELOGAhmad Sherif
2016-09-23Reduce number of queries when calling GlobalMilestone#{labels,participants}Ahmad Sherif
2016-09-23Merge branch 'search-filters-label-fix' into 'master' Jacob Schatz
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
2016-09-22Merge branch 'fix-find-file-links' into 'master' Fatih Acet
Fix find file navigation links ## What does this MR do? Modified the tables in [find file page](https://gitlab.com/ClemMakesApps/gitlab-ce/find_file/master), so that clicking the entire row will go to the file rather than forcing the user to click on the text ## Are there points in the code the reviewer needs to double check? We should be good ## Why was this MR needed? Resolve UI inconsistency. Other pages UX indicate that the rows are clickable when highlighted. It is not the case for this page ## Screenshots (if relevant) Before: ![tdo6Jt3xmd](/uploads/31e7654c49bb141002cfec4ce859fb46/tdo6Jt3xmd.gif) After: ![NdiIqqHa7R](/uploads/fa440ebaa847064ff098a98dfb7fef57/NdiIqqHa7R.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [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? Closes #22016 See merge request !6290
2016-09-22Merge branch 'search-field-ignores' into 'master' Rémy Coutable
Intercept issues search form submit to preserve filters. ## What does this MR do? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/896 by intercepting manual search form submission and redirecting it to use existing logic (now factored out into `executeSearch`). ## Why was this MR needed? Manual form submission (keying in 'enter') in issues search did not preserve applied filters. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/896 See merge request !6054
2016-09-22Intercept issues search form submit to preserve filters.Bryce
2016-09-22Remove colons in dropdowns, use icon helper, and fix 'Show original' link.Bryce Johnson
(Also removes duplicate changelog entry.)
2016-09-22Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"Rubén Dávila Santos
This reverts merge request !6429
2016-09-21Merge branch 'and-you-get-awards' into 'master' Rémy Coutable
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
2016-09-21Merge branch 'show-all-pipelines-from-all-diffs' into 'master' Rémy Coutable
Show all pipelines from all merge_request_diffs This way we could also show pipelines from commits which were discarded due to a force push. Closes #21889 See merge request !6414
2016-09-21Merge branch 'limit-number-of-shown-environments' into 'master' Rémy Coutable
Limit number of shown environments ## What does this MR do? This MR limits in context of Merge Request a list of shown environments. Previously we would show all environments containing the SHA of the head commit of Merge Request. However, with introducing of dynamically created environments this lead to a cases that we would show multiple review apps, for different branches, because these branches would contain a new questioned commit. This MR changes what environments we test against presence of the commit, to: 1. We look for environments with deployments to source_branch of source_project: used for deployments to per-branch environments, 2. We look for environments with deployments to target_branch of target_project: used for deployments to staging / production environments, 3. We look for environments with deployments for tags on target_project: used for staging / production environments. ## Why was this MR needed? To improve a list of returned environments when we introduced ability to create dynamic environments for review apps: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6323 See merge request !6438
2016-09-21Add 8.11.7, 8.10.10, and 8.9.10 CHANGELOG entriesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-21Added horizontal padding on build page sidebar on code coverage blockVitaly Baev
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-21Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable
Add spec covering 'committer_hash' Adds a missing spec from changes added in !5822 See merge request !6433
2016-09-21Add tests to verify the correctness of returned environmentsKamil Trzcinski
2016-09-21Changed props to use stringsPhil Hughes
Use jQuery
2016-09-21Fixed comment & resolve buttonPhil Hughes
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-20Merge branch 'issue_20078' into 'master' Yorick Peterse
Test if issue authors can access private projects See merge request !6419
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-20Test if issue authors can access private projectsFelipe Artur
2016-09-20Add spec covering 'committer_hash'Dan Dunckel
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-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-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-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-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