summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | fix `register runner with services`Woko2019-07-161-2/+2
| | |
* | | Merge branch 'docs/autocomplete_characters' into 'master'Evan Read2019-07-174-0/+51
|\ \ \ | | | | | | | | | | | | | | | | Documented autocomplete characters See merge request gitlab-org/gitlab-ce!30723
| * | | Documented autocomplete charactersRussell Dickenson2019-07-174-0/+51
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Added a table listing all autocomplete characters. - Added a link to the autocomplete characters docs, from the Projects feature list. - Added an example of how autocomplete would behave for `Users and groups`, including two screenshots.
* | | Merge branch 'tip-for-ansi-colors' into 'master'Evan Read2019-07-171-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add tip about stripping ANSI color codes Closes gitlab-runner#3559 See merge request gitlab-org/gitlab-ce!30701
| * | | Add tip about stripping ANSI color codesElliot Rushton2019-07-171-0/+16
|/ / /
* | | Merge branch 'qa-selector-uniformization-common-2' into 'master'Mark Lapierre2019-07-174-23/+23
|\ \ \ | | | | | | | | | | | | | | | | Refactor common Page Objects to use data tags (No. 2 Contd.) See merge request gitlab-org/gitlab-ce!30763
| * | | Refactor more common Page Objects to use data tagsqa-selector-uniformization-common-2ddavison2019-07-154-23/+23
| | | | | | | | | | | | | | | | Common usages within GitLab QA include login page, navbars and layouts
* | | | Merge branch 'sl-qa-staging-39-fix-assign-code-owners-spec-ce' into 'master'Mark Lapierre2019-07-172-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE port of "Fix assign code owners spec" on EE See merge request gitlab-org/gitlab-ce!30743
| * | | | Backport ee to cesl-qa-staging-39-fix-assign-code-owners-spec-ceSanad Liaquat2019-07-152-1/+8
| | | | |
* | | | | Merge branch 'docs/update-time-tracking-release-info' into 'master'Evan Read2019-07-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change time tracking units feature release version See merge request gitlab-org/gitlab-ce!30771
| * | | | | Change time tracking units feature release versiondocs/update-time-tracking-release-infoHeinrich Lee Yu2019-07-161-1/+1
| | | | | |
* | | | | | Merge branch 'dependency-scanning-propagate-pip-index-url' into 'master'Mayra Cabrera2019-07-172-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate PIP index URL See merge request gitlab-org/gitlab-ce!30704
| * | | | | | Propagate PIP index URLFabien Catteau2019-07-172-0/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate PIP_INDEX_URL, PIP_EXTRA_INDEX_URL to the dependency-scanning Docker image to support Python projects depending on custom Pypi registries. These variables will be consumed by the gemnasium-python analyzer.
* | | | | | Merge branch 'docs-pages-cloudflare' into 'master'Evan Read2019-07-171-5/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update Cloudflare's redirect method for Pages Closes #64655 See merge request gitlab-org/gitlab-ce!30786
| * | | | | | Docs: update Cloudflare's redirect method for PagesMarcia Ramos2019-07-171-5/+16
|/ / / / / /
* | | | | | Merge branch '3rd-party-parallel-tools' into 'master'Evan Read2019-07-172-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 3rd party parallel tools section to docs See merge request gitlab-org/gitlab-ce!30434
| * | | | | | Add 3rd party parallel tools section to docsArtur Trzop2019-07-172-0/+5
|/ / / / / /
* | | | | | Merge branch 'revert-222d0019' into 'master'Paul Slaughter2019-07-162-6/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'button-bug-fixes' into 'master'" See merge request gitlab-org/gitlab-ce!30821
| * | | | | | Revert "Merge branch 'button-bug-fixes' into 'master'"revert-222d0019Annabel Dunstone Gray2019-07-162-6/+1
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !30678
* | | | | | | Merge branch '12800-read-and-write-user-admin-notes-via-api-ce' into 'master'Stan Hu2019-07-163-7/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Read and write User "Admin notes" via API See merge request gitlab-org/gitlab-ce!30775
| * | | | | | | CE: Read and write User "Admin notes" via APImanojmj2019-07-173-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the ability to read and write admin notes for a user via the USER API
* | | | | | | | Merge branch ↵Evan Read2019-07-161-5/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '12812-geo-update-current-limitations-of-background-verification-docs' into 'master' Geo - Update current limitations for automatic background verification Closes gitlab-ee#12812 See merge request gitlab-org/gitlab-ce!30688
| * | | | | | | Update current limitations for automatic background verification12812-geo-update-current-limitations-of-background-verification-docsDouglas Barbosa Alexandre2019-07-151-5/+12
| | | | | | | |
* | | | | | | | Merge branch 'revert-af42c169' into 'master'Paul Slaughter2019-07-1615-98/+89
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '61145-fix-button-dimensions' into 'master'" See merge request gitlab-org/gitlab-ce!30798
| * | | | | | | Revert "Merge branch '61145-fix-button-dimensions' into 'master'"revert-af42c169Annabel Dunstone Gray2019-07-1615-98/+89
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !28545
* | | | | | | | Merge branch 'ci-job-only-except-conflict-specs' into 'master'59381-cannot-show-closed-milestones-on-milestones-pageThong Kuah2019-07-161-62/+184
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added specs for CI Job inclusion when only: and except: both match See merge request gitlab-org/gitlab-ce!30057
| * | | | | | | | Build instead of createci-job-only-except-conflict-specsdrew cimino2019-07-161-1/+1
| | | | | | | | |
| * | | | | | | | Polish for Ci::Pipeline::Seed::Build specsdrew cimino2019-07-111-62/+143
| | | | | | | | |
| * | | | | | | | Added specs for Ci::Pipeline::Seed::Builddrew cimino2019-07-111-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - #included? when only: and except: both match
* | | | | | | | | Merge branch 'dz-remove-old-ignore-column' into 'master'Robert Speicher2019-07-166-20/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old ignore_column in AR models See merge request gitlab-org/gitlab-ce!30725
| * | | | | | | | | Remove old ignore_column in AR modelsdz-remove-old-ignore-columnDmitriy Zaporozhets2019-07-156-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Next models are affected: * Project * Namespace * Issue * Merge request * CI Trigger * CI Pipeline schedule Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'jc-fix-rugged-feature-flag-rake' into 'master'Stan Hu2019-07-161-3/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unset_rugged rake task Closes #64441 See merge request gitlab-org/gitlab-ce!30636
| * | | | | | | | | | Add unset_rugged rake taskjc-fix-rugged-feature-flag-rakeJohn Cai2019-07-111-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an unset_rugged rake task that unsets all rugged feature flags. Also fixes the existing disable_rugged task to have it explicitly disable feature flags instead of just unsetting them.
* | | | | | | | | | | Merge branch 'rename-banzai-redactors' into 'master'Douglas Barbosa Alexandre2019-07-169-13/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Redactor classes to ReferenceRedactor See merge request gitlab-org/gitlab-ce!30408
| * | | | | | | | | | | Rename Redactor classes to ReferenceRedactorSarah Yasonik2019-07-169-13/+13
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '56883-add-prometheus-settings-to-gitlab-yml' into 'master'Stan Hu2019-07-165-0/+492
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Service to create self monitoring project See merge request gitlab-org/gitlab-ce!30153
| * | | | | | | | | | | Don't use transactions and exceptionsReuben Pereira2019-07-165-0/+492
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead return error objects.
* | | | | | | | | | | Merge branch 'unlink-metrics-feature-flags' into 'master'Stan Hu2019-07-162-78/+137
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor EnvironmentsController#metrics_dashboard endpoint See merge request gitlab-org/gitlab-ce!30782
| * | | | | | | | | | | Refactor EnvironmentsController#metrics_dashboard endpointSarah Yasonik2019-07-162-78/+137
|/ / / / / / / / / / /