summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Unquarantine object storage testqa-unquarantine-attachment-testMark Lapierre2019-07-181-2/+1
| | | | | --compat mode in Minio is now enabled so this test should pass See https://gitlab.com/gitlab-org/gitlab-qa/merge_requests/260
* Merge branch 'patch-72' into 'master'Ray Paik2019-07-181-1/+1
|\ | | | | | | | | typo See merge request gitlab-org/gitlab-ce!30860
| * typomtmail2019-07-171-1/+1
| |
* | Merge branch 'fj-refactor-web-ide-counter' into 'master'Nick Thomas2019-07-178-76/+47
|\ \ | | | | | | | | | | | | Refactor WebIdeCommitsCounter and RedisCounter See merge request gitlab-org/gitlab-ce!30850
| * | Refactor RedisCounter and WebIdeCommitsCounterFrancisco Javier López2019-07-178-76/+47
|/ / | | | | | | | | This MR refactor RedisCounter and WebIdeCommitsCounter to be reused by other components.
* | Merge branch 'qa-review-knapsack-reports' into 'master'Mark Lapierre2019-07-174-1/+120
|\ \ | | | | | | | | | | | | Generate single report file for review-qa-all parallel tests See merge request gitlab-org/gitlab-ce!28834
| * | Generate parallel spec reportsqa-review-knapsack-reportsDesiree Chevalier2019-07-174-1/+120
| | | | | | | | | | | | | | | Creates reports for parallel specs and collates them into a single HTML report and displays results on the merge request.
* | | Merge branch 'jc-wrap-rugged-calls-with-disk-access' into 'master'Stan Hu2019-07-179-22/+27
|\ \ \ | | | | | | | | | | | | | | | | Wrap rugged calls with access disk block See merge request gitlab-org/gitlab-ce!30592
| * | | Wrap rugged calls with access disk blockjc-wrap-rugged-calls-with-disk-accessJohn Cai2019-07-169-22/+27
| | | | | | | | | | | | | | | | | | | | Whenever we use the rugged implementation, we are going straight to disk so we want to bypass the disk access check.
* | | | Merge branch 'winh-multiple-issueboards-core' into 'master'Mike Greiling2019-07-1710-4/+887
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move multiple issue boards frontend to core (CE-backport) See merge request gitlab-org/gitlab-ce!30503
| * | | | Move boards switcher partialWinnie Hellmann2019-07-1710-4/+887
|/ / / / | | | | | | | | | | | | (cherry picked from commit a82e4d57a6fbba840a8a944e372b80866a1e48cc)
* | | | Merge branch '50228-add-test-for-deploy-token-username' into 'master'Mayra Cabrera2019-07-171-0/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add tests for when deploy token usernames are not unique See merge request gitlab-org/gitlab-ce!30629
| * | | | Add tests for when deploy token usernames are not uniqueKrasimir Angelov2019-07-171-0/+64
|/ / / / | | | | | | | | | | | | | | | | Ensure correct behaviour when deploy tokens have the same username or deploy token and user have the same username.
* | | | Merge branch 'fix-project-factory-pages-access-level-default' into 'master'Stan Hu2019-07-172-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix factory default for pages_access_level See merge request gitlab-org/gitlab-ce!30862
| * | | | Fix factory default for pages_access_levelVladimir Shushlin2019-07-172-3/+5
|/ / / / | | | | | | | | | | | | | | | | Pages access level currently depends on project visibilty which is ignored by factory, this commit fixes that
* | | | Merge branch 'docs-quality-data-qa-selector' into 'master'Dan Davison2019-07-172-26/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add documentation surrounding [data-qa-selector] See merge request gitlab-org/gitlab-ce!30690
| * | | | Add documentation surrounding [data-qa-selector]Dan Davison2019-07-172-26/+45
|/ / / / | | | | | | | | | | | | | | | | Documentation was lacking for the [data-qa-selector] method of defining methods vs .qa-selector method.
* | | | Merge branch 'rs-zz-metrics' into 'master'Lin Jen-Shin2019-07-171-0/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add EE-only class instrumentation See merge request gitlab-org/gitlab-ce!30802
| * | | | Add EE-only class instrumentationrs-zz-metricsRobert Speicher2019-07-161-0/+31
| | | | |
* | | | | Merge branch 'mh/net-mocks-2' into 'master'Mike Greiling2019-07-179-14/+269
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mockify jquery and axios packages into `spec/frontend` Closes #60136 See merge request gitlab-org/gitlab-ce!29272
| * | | | | Mockify jquery and axios packagesMartin Hanzel2019-07-179-14/+269
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Moved the block that fails tests on unmocked axios requests from test_setup to its own mock, and added a jQuery mock that fails tests if they use unmocked $.ajax().
* | | | | Merge branch 'mh/mocks-doc-2' into 'master'Mike Greiling2019-07-171-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs about auto-injected Jest mocks Closes #62899 See merge request gitlab-org/gitlab-ce!30791
| * | | | | Add docs about auto-injected Jest mocksMartin Hanzel2019-07-171-0/+28
|/ / / / /
* | | | | Merge branch '9928ee-add-rule_type-to-approval-project-rules' into 'master'Mayra Cabrera2019-07-174-0/+41
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Add migration for adding rule_type to approval_project_rules See merge request gitlab-org/gitlab-ce!30575
| * | | | Add rule_type to approval_project_rulesLucas Charles2019-07-174-0/+41
|/ / / / | | | | | | | | | | | | | | | | Adds migration to introduce non-regular rule_types to approval_project_rules
* | | | Merge branch 'issue-64645-asciidoctor-footnote-links' into 'master'Nick Thomas2019-07-173-5/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve footnote link ids Closes #64645 See merge request gitlab-org/gitlab-ce!30790
| * | | | Preserve footnote link idsGuillaume Grossetie2019-07-173-5/+83
| | | | |
* | | | | Merge branch 'danger-throughputs' into 'master'Lin Jen-Shin2019-07-171-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Danger asks for throughput labels See merge request gitlab-org/gitlab-ce!30622
| * | | | | Danger asks for throughput labelsdanger-throughputsMark Fletcher2019-07-111-0/+12
| | | | | |
* | | | | | Merge branch 'remove_clusters_cte_feature_flag' into 'master'Douglas Barbosa Alexandre2019-07-172-39/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes clusters_cte feature flag Closes #64259 See merge request gitlab-org/gitlab-ce!30827
| * | | | | | Removes clusters_cte feature flagremove_clusters_cte_feature_flagThong Kuah2019-07-172-39/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been enabled on production without issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64259
* | | | | | | Merge branch '10009-boards-index' into 'master'Phil Hughes2019-07-172-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for modal issues board See merge request gitlab-org/gitlab-ce!30836
| * | | | | | | Removes EE differences for modal issues board10009-boards-indexFilipa Lacerda2019-07-172-1/+3
| | | | | | | |
* | | | | | | | Merge branch '48771-label-picker-line-break-on-long-label-titles' into 'master'Kushal Pandya2019-07-174-2/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Label picker: Line break on long label titles" Closes #48771 See merge request gitlab-org/gitlab-ce!30610
| * | | | | | | | Resolve "Label picker: Line break on long label titles"Ammar Alakkad2019-07-174-2/+12
|/ / / / / / / /
* | | | | | | | Merge branch 'id-submodule-url-graphql' into 'master'Nick Thomas2019-07-1718-43/+213
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of Gitaly calls for submodules See merge request gitlab-org/gitlab-ce!30735
| * | | | | | | | Added submodule links to Submodule type in GraphQL APIIgor2019-07-1718-43/+213
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is part of migration of Folder View to Vue
* | | | | | | | Merge branch 'letsencrypt-documentation' into 'master'Nick Thomas2019-07-178-6/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for Let's Encrypt integration See merge request gitlab-org/gitlab-ce!30627
| * | | | | | | | Add docs for Let's Encrypt integrationVladimir Shushlin2019-07-178-6/+105
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add deprecation warning to old integration * Add user docs * Add admin docs
* | | | | | | | Merge branch 'fix-pages-access-level-defaults' into 'master'Nick Thomas2019-07-178-2/+301
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pages access level defaults See merge request gitlab-org/gitlab-ce!30354
| * | | | | | | | Fix wrong pages access level defaultVladimir Shushlin2019-07-178-2/+301
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Set access level in before_validation hook - Add post migration for updating existing project_features
* | | | | | | | Merge branch 'if-64315-mget_sessions_in_chunks' into 'master'Thong Kuah2019-07-173-4/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Do Redis lookup in batches in ActiveSession.sessions_from_ids See merge request gitlab-org/gitlab-ce!30561
| * | | | | | | Do Redis lookup in batches in ActiveSession.sessions_from_idsImre Farkas2019-07-173-4/+26
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By doing smaller mget calls to Redis, it can better schedule the workload. Currently a single mget with a lot of keys can keep Redis busy for long, while nothing in its queue gets processed.
* | | | | | | Merge branch ↵James Lopez2019-07-174-53/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'if-12036-move_external_authorization_service_api_management_to_ee' into 'master' CE port of "Move external authorization service API management to EE" See merge request gitlab-org/gitlab-ce!30578
| * | | | | | | CE port of "Move external authorization service API management to EE"Imre Farkas2019-07-174-53/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14598
* | | | | | | Merge branch 'sh-bump-fog-aws' into 'master'Sean McGivern2019-07-173-3/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump fog-aws to v3.5.2 Closes #63041 See merge request gitlab-org/gitlab-ce!30803
| * | | | | | | Bump fog-aws to v3.5.2sh-bump-fog-awsStan Hu2019-07-163-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it possible for Oracle Cloud to work with S3 by disabling Signature V4 streaming (https://github.com/fog/fog-aws/issues/523). Full CHANGELOG: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63041
* | | | | | | | Merge branch 'issue-zoom-url' into 'master'Clement Ho2019-07-178-75/+110
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use backend to determine if issue desc contains zoom link Closes #63282 See merge request gitlab-org/gitlab-ce!29910
| * | | | | | | | Fetch latest link in the description for zoom link, add more tests and ↵Rajendra kadam2019-07-178-75/+110
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | remove frontend spec unnecessary tests
* | | | | | | | Merge branch 'patch-72' into 'master'Evan Read2019-07-171-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix docs typo: register runner with services See merge request gitlab-org/gitlab-ce!30769