summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Preload tags when loading Ci::Pipelinemc/bug/nplusone-pipelines-showMatija Čupić2019-08-231-1/+1
|
* Merge branch 'winh-deduplicate-board-headers' into 'master'Kushal Pandya2019-08-236-6/+43
|\ | | | | | | | | Hide duplicate board list while dragging See merge request gitlab-org/gitlab-ce!32099
| * Hide duplicate board list while draggingWinnie Hellmann2019-08-236-6/+43
|/
* Merge branch 'docs-12713-vulnerabilities-dl-api' into 'master'Achilleas Pipinellis2019-08-231-5/+11
|\ | | | | | | | | Update dependencies api doc See merge request gitlab-org/gitlab-ce!32061
| * Update dependencies api docTetiana Chupryna2019-08-231-5/+11
|/
* Merge branch 'ac-uploads-docs' into 'master'Nick Thomas2019-08-233-0/+274
|\ | | | | | | | | | | | | Document uploads development guidelines Closes #63097 See merge request gitlab-org/gitlab-ce!31290
| * Document uploads development guidelinesAlessio Caiazza2019-08-233-0/+274
|/ | | | Explain Workhorse acceleration features
* Merge branch 'frozen_string_lib_2' into 'master'Nick Thomas2019-08-23201-3/+401
|\ | | | | | | | | Add frozen_string_literal to lib part 2 See merge request gitlab-org/gitlab-ce!32094
| * Fix frozen string errorfrozen_string_lib_2Thong Kuah2019-08-231-1/+2
| |
| * Fix frozen string errorsThong Kuah2019-08-232-2/+2
| |
| * Add frozen_string_literal to lib part 2Thong Kuah2019-08-23199-0/+397
| | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | Merge branch '66022-git-clone-url-box-on-wiki-git-access-page-is-broken' ↵Annabel Dunstone Gray2019-08-239-38/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Git clone URL box on Wiki git access page is broken" Closes #66022 See merge request gitlab-org/gitlab-ce!31898
| * | Fix broken git clone box on wiki git access pageHimanshu Kapoor2019-08-239-38/+29
|/ / | | | | | | | | | | Some CSS fixes to fix the position of the git clone box on the wiki git access page. This fix also includes fixes for various responsive states.
* | Merge branch '64385-charts-scroll-handle-icon-has-disappeared' into 'master'Filipa Lacerda2019-08-233-1/+14
|\ \ | | | | | | | | | | | | fix charts scroll handle icon See merge request gitlab-org/gitlab-ce!31825
| * | fix charts scroll handle iconLaura Montemayor2019-08-233-1/+14
|/ /
* | Merge branch 'labkit-cache-tracing' into 'master'Nick Thomas2019-08-234-4/+14
|\ \ | | | | | | | | | | | | Add Redis interceptor tracing See merge request gitlab-org/gitlab-ce!30238
| * | Add cache tracing and Redis tracingAndrew Newdigate2019-08-234-4/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds Distributed Tracing support for two new types of events 1. Redis Calls 1. ActiveSupport (Rails) Caching Operations The intention is to help application developers and infrastructure SREs to understand the pressure that caching operations can have on the application when running at scale. The Redis and Caching spans can be viewed in the Jaeger UI by clicking the "Trace" link in the performance bar when running on GDK.
* | Merge branch 'optimise-build-queue-service' into 'master'Grzegorz Bizon2019-08-235-51/+103
|\ \ | | | | | | | | | | | | | | | | | | Optimise UpdateBuildQueueService Closes #66438 See merge request gitlab-org/gitlab-ce!32095
| * | Optimise build queue serviceoptimise-build-queue-serviceKamil Trzciński2019-08-225-51/+103
| | | | | | | | | | | | | | | | | | | | | | | | This makes BuildQueueService to force refresh runners that are considered to have recent queue. Such runners are the ones that connected within online interval + time to expire runner cache.
* | | Merge branch 'docs-65631-rename-approval-rule' into 'master'Achilleas Pipinellis2019-08-233-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update documentation screenshot See merge request gitlab-org/gitlab-ce!31995
| * | | Update documentation screenshotSamantha Ming2019-08-233-1/+1
|/ / /
* | | Merge branch 'v12-upgrade-recommendation-docs' into 'master'Achilleas Pipinellis2019-08-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add version 12 upgrade recommendations Closes #63907 See merge request gitlab-org/gitlab-ce!30201
| * | | Add version 12 upgrade recommendationsGreg Myers2019-08-231-0/+1
|/ / / | | | | | | | | | Updates doc/policy/maintenance.md, adds upgrade path from 11 -> 12
* | | Merge branch 'docs-capitalization-1' into 'master'Achilleas Pipinellis2019-08-2324-43/+43
|\ \ \ | | | | | | | | | | | | | | | | Update capitalization in /administration, /api, others See merge request gitlab-org/gitlab-ce!32136
| * | | Update capitalization in admin, api, othersMarcel Amirault2019-08-2324-43/+43
|/ / / | | | | | | | | | | | | Update capitalization in /administration, /api, /ci and /customization
* | | Merge branch ↵Jan Provaznik2019-08-233-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49392-exempt-jwt-auth-for-user-gitlab-ci-token-from-rate-limiting' into 'master' Exempt `jwt/auth` for user `gitlab-ci-token` from rate limiting Closes #49392 See merge request gitlab-org/gitlab-ce!31909
| * | | Exempt `jwt/auth` for user `gitlab-ci-token` from rate limitingMarius Bobin2019-08-233-3/+12
|/ / /
* | | Merge branch 'qa-ml-fix-view-commit-patch-test' into 'master'Sanad Liaquat2019-08-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Failure in qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb" Closes gitlab-org/quality/staging#69 See merge request gitlab-org/gitlab-ce!32087
| * | | Fix failing testqa-ml-fix-view-commit-patch-testMark Lapierre2019-08-221-1/+1
| | | | | | | | | | | | | | | | Optionally check for quotes and escape the name
* | | | Merge branch 'respect-user-do-not-track' into 'master'Kushal Pandya2019-08-232-1/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add logic for respecting browser DNT setting See merge request gitlab-org/gitlab-ce!32030
| * | | | Add logic for respecting browser DNT settingJeremy Jackson2019-08-232-1/+34
|/ / / /
* | | | Merge branch '51470-webide-default-commit' into 'master'Paul Slaughter2019-08-2219-262/+619
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "WebIDE Default Commit options" Closes #51470 See merge request gitlab-org/gitlab-ce!31449
| * | | | Always pre-select "Start a new merge request"Denys Mishunov2019-08-2219-262/+619
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One exception: there is an existing MR for the current branch and the branch is non-default and non-protected. Extended mock_data for ide/stores to have different types of branches: default, protected and regular Cleaned new MR checkbox view
* | | | Merge branch '59053-no-oauth-for-cicd-github-fe' into 'master'Mayra Cabrera2019-08-226-37/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Mirroring for external CI/CD repositories should not store OAuth token" See merge request gitlab-org/gitlab-ce!31488
| * | | | Update GitHub CI/CD import page to use PAT onlyScott Hampton2019-08-226-37/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oauth2 tokens are causing issues with mirroring repos, because it effectively limits the number of repos you can mirror. Personal Access Tokens do not have this problem. This change removes the OAuth2 option from the import page for CI/CD only, and only provides the personal access token form.
* | | | Merge branch 'ml-update-qa-readme-docs' into 'master'Mark Lapierre2019-08-221-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update QA readme to note that Chrome/Chromium is required See merge request gitlab-org/gitlab-ce!32035
| * | | | Update QA readme to note that Chrome/Chromium is requiredMark Lapierre2019-08-221-0/+5
|/ / / /
* | | | Merge branch 'sh-revert-redis-cache-store' into 'master'Mayra Cabrera2019-08-222-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "ERR value is not an integer or out of range" errors Closes #66449 See merge request gitlab-org/gitlab-ce!32126
| * | | | Fix "ERR value is not an integer or out of range" errorsStan Hu2019-08-222-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveSupport::Cache::RedisCacheStore` is not compatible with the version of Rack Attack we are using (v4.4.1) per https://github.com/kickstarter/rack-attack/issues/281. Users that had rate limits enabled might see `Redis::CommandError: ERR value is not an integer or out of range` because the `raw` parameter wasn't passed along properly. As a result, the Rack Attack entry would be stored as an `ActiveSupport::Cache::Entry` instead of a raw string holding an integer value. Let's partially revert the change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30966 to use the original cache store until we can update to Rack Attack v5.2.3 that has support for `ActiveSupport::Cache::RedisCacheStore` via https://github.com/kickstarter/rack-attack/pull/350. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66449
* | | | | Merge branch 'ac-graphql-root-namespace-stats' into 'master'Mayra Cabrera2019-08-2218-4/+256
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose namespace storage statistics with GraphQL See merge request gitlab-org/gitlab-ce!32012
| * | | | | Expose namespace storage statistics with GraphQLAlessio Caiazza2019-08-2218-4/+256
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Root namespaces have storage statistics. This commit allows namespace owners to get those stats via GraphQL queries like the following one { namespace(fullPath: "a_namespace_path") { rootStorageStatistics { storageSize repositorySize lfsObjectsSize buildArtifactsSize packagesSize wikiSize } } }
* | | | | Merge branch 'enable-csp-in-dev-and-ci-ce' into 'master'Stan Hu2019-08-222-5/+29
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | [CE] Enable CSP in dev and CI See merge request gitlab-org/gitlab-ce!31800
| * | | | Enable CSP in gitlab.yml.exampleenable-csp-in-dev-and-ci-ceHeinrich Lee Yu2019-08-222-5/+29
|/ / / / | | | | | | | | | | | | This enables CSP in dev and CI
* | | | Merge branch 'patch-73' into 'master'Stan Hu2019-08-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typo in Content Security Policy example See merge request gitlab-org/gitlab-ce!32103
| * | | | Fix typo in Content Security Policy exampleJ0WI2019-08-221-1/+1
| | | | |
* | | | | Merge branch 'docs-admin-area-core-only' into 'master'66138-refactor-groupdata-in-embed-componentAchilleas Pipinellis2019-08-2212-12/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add core badges to admin_area docs See merge request gitlab-org/gitlab-ce!31746
| * | | | | Add core badges to admin_area docsMarcel Amirault2019-08-2212-12/+12
|/ / / / / | | | | | | | | | | | | | | | Some admin_area docs were missing the Core Only badge
* | | | | Merge branch 'docs-gitaly-cli-connect-failed' into 'master'Achilleas Pipinellis2019-08-221-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document Gitaly CLI connection troubleshooting See merge request gitlab-org/gitlab-ce!32079
| * | | | | Document Gitaly CLI connection troubleshootingChristiaan Conover2019-08-221-0/+30
|/ / / / / | | | | | | | | | | | | | | | | | | | | Provide documentation around possible reasons and solutions to CLI tools not being able to connect to Gitaly nodes.
* | | | | Merge branch 'ce-8631-archiving-a-project-should-create-an-audit-event' into ↵Lin Jen-Shin2019-08-223-4/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE: Archiving a project should create an audit event See merge request gitlab-org/gitlab-ce!32039
View Lorry Controller Status