summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Run least expensive method firstThong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If environment is not available, then no point running the more expensive `prometheus_adapter`.
* | | | | | | | | | | | Merge branch 'docs-variables-reference-improvement' into 'master'Evan Read2019-06-241-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: link to predefined env variables reference more evident Closes #62845 See merge request gitlab-org/gitlab-ce!29857
| * | | | | | | | | | | Docs: link to predefined env variables reference more evidentMarcia Ramos2019-06-241-3/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Update VERSION to 12.1.0-prev12.1.0.pre12-1-auto-deploy-0011198GitLab Release Tools Bot2019-06-221-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 12.0.0GitLab Release Tools Bot2019-06-22287-1433/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | Merge branch '11707-add-copy-to-clipboard-cursed-backport' into 'master'Fatih Acet2019-06-211-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Copy to Clipboard CE Backport See merge request gitlab-org/gitlab-ce!29906
| * | | | | | | | | | | Add CE backport11707-add-copy-to-clipboard-cursed-backportsarahghp2019-06-201-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '49814-display-in-admin-area-if-emails-are-verified-or-not' ↔Mike Greiling2019-06-213-2/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Display in admin area if emails are verified or not" Closes #49814 See merge request gitlab-org/gitlab-ce!29669
| * | | | | | | | | | | | Add verification badge to users emails49814-display-in-admin-area-if-emails-are-verified-or-notBrandon Labuschagne2019-06-203-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is being applied to the admin users view, when an admin selects a user profile tp view. It gives admins the ability to see an email verification status without the need of impersonating a user.
* | | | | | | | | | | | | Merge branch 'app-label-warning' into 'master'Mike Greiling2019-06-218-0/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | App label warning for deploy boards See merge request gitlab-org/gitlab-ce!29740
| * | | | | | | | | | | | | Select deployments that only has the app labelThong Kuah2019-06-218-0/+54
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Auto DevOps deployments both label and annotations, that will be included in the deploy board so need to warn at all.
* | | | | | | | | | | | | Merge branch ↔Stan Hu2019-06-213-23/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-key' into 'master' Include the GitLab version in the cache key for Gitlab::JsonCache See merge request gitlab-org/gitlab-ce!29938
| * | | | | | | | | | | | | Add CHANGELOG entry63513-ensure-gitlab-jsoncache-includes-the-gitlab-version-in-the-cache-keyDouglas Barbosa Alexandre2019-06-211-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Include the GitLab version in the cache key for Gitlab::JsonCacheDouglas Barbosa Alexandre2019-06-212-23/+49
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2019-06-2112-49/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade prettier to latest (v1.18.2) See merge request gitlab-org/gitlab-ce!29943
| * | | | | | | | | | | | | | Upgrade prettier to latest (v1.18.2)Mike Greiling2019-06-2112-49/+19
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrades prettier to the latest version, and auto-corrects files with yarn prettier-all-save The diffs all seem to stem from formatting changes in brackets within template literals. Nothing major. Relevant changelogs here: https://prettier.io/blog/2019/04/12/1.17.0.html https://prettier.io/blog/2019/06/06/1.18.0.html
* | | | | | | | | | | | | | Merge branch '42399-registry-confirm-deletion' into 'master'Tim Zallmann2019-06-2110-30/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confirmation for registry image deletion Closes #42399 See merge request gitlab-org/gitlab-ce!29505
| * | | | | | | | | | | | | Add confirmation for registry image deletionPaul Gascou-Vaillancourt2019-06-2110-30/+167
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a modal to let the user confirm their action before proceeding to registry/image deletion
* | | | | | | | | | | | | Merge branch 'docs/deps-gemansium' into 'master'Mike Lewis2019-06-211-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gemnasium dead link from docs See merge request gitlab-org/gitlab-ce!29942
| * | | | | | | | | | | | | Remove Gemnasium dead link from docsAchilleas Pipinellis2019-06-211-8/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-prometheus-service-discovery' into 'master'Achilleas Pipinellis2019-06-216-2/+192
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for Prometheus Service Discovery Closes #63110 See merge request gitlab-org/gitlab-ce!29811
| * | | | | | | | | | | | Adding documentation for Prometheus Service DiscoveryAric Buerer2019-06-216-2/+192
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating documentation to include Prometheus Service Discovery. Added monitoring node documentaiton as well as documentation for the individual service nodes.
* | | | | | | | | | | | Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'Douglas Barbosa Alexandre2019-06-213-7/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid storing backtraces from Bitbucket Cloud imports in the database See merge request gitlab-org/gitlab-ce!29862
| * | | | | | | | | | | | Avoid storing backtraces from Bitbucket Cloud imports in the databasesh-clean-up-bitbucket-import-errorsStan Hu2019-06-193-7/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We noticed in https://gitlab.com/gitlab-com/gl-infra/production/issues/908 some Bitbucket imports took over a second to load their projects row because `import_error` was huge due to errors. To prevent this, we now: 1. Clean the backtraces 2. Log the details into importer.log 3. Omit the details from the database
* | | | | | | | | | | | | Merge branch '58065-uniform-html-txt-email' into 'master'Sean McGivern2019-06-219-85/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make HTML and text emails for new issues uniform and add the mail to mailer previews Closes #58065 See merge request gitlab-org/gitlab-ce!29886
| * | | | | | | | | | | | Uniform html and text emails58065-uniform-html-txt-emailFrank van Rest2019-06-219-85/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniform new_issue_email html and text emails Uniform note_email html and text emails Uniform new_merge_request_email html and text emails
* | | | | | | | | | | | | Merge branch 'docs/container-scanning-nfs-bug' into 'master'Mike Lewis2019-06-211-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention Container Scanning NFS bug and how to fix it Closes gitlab-ee#11429 See merge request gitlab-org/gitlab-ce!29908
| * | | | | | | | | | | | | Mention Container Scanning NFS bug and how to fix itAchilleas Pipinellis2019-06-211-0/+20
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/web-terminals-cleanup' into 'master'Mike Lewis2019-06-211-53/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the web terminals docs See merge request gitlab-org/gitlab-ce!29929
| * | | | | | | | | | | | | Clean up the web terminals docsdocs/web-terminals-cleanupAchilleas Pipinellis2019-06-211-53/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clarify that they are available only for private Runners - Merge the two sections of file syncing into one
* | | | | | | | | | | | | | Merge branch '38105-pre-release-tag' into 'master'Kushal Pandya2019-06-214-9/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders pre-release tag for pre-releases See merge request gitlab-org/gitlab-ce!29797
| * | | | | | | | | | | | | | Renders pre-release tag for pre-releases38105-pre-release-tagFilipa Lacerda2019-06-214-9/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a release is a pre release, we render an orange badge with `pre-release` label
* | | | | | | | | | | | | | | Merge branch 'patch-71' into 'master'Stan Hu2019-06-212-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rouge See merge request gitlab-org/gitlab-ce!29541
| * | | | | | | | | | | | | | | Bump rouge to 3.4.1Zoid2019-06-212-7/+8
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md#version-341-2019-06-13
* | | | | | | | | | | | | | | Merge branch ↔Stan Hu2019-06-214-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' into 'master' Fix copying a single line from Firefox Closes #63406 See merge request gitlab-org/gitlab-ce!29832
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ↔63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-alsoAdam Hegyi2019-06-1954-101/+198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' # Conflicts: # spec/lib/gitlab/ci/ansi2html_spec.rb
| * | | | | | | | | | | | | | | | Fix copying a single line from FirefoxAdam Hegyi2019-06-194-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that all open <span> tags are closed before adding a <br> tag.
* | | | | | | | | | | | | | | | | Merge branch 'bw-issue-reorder' into 'master'Kamil TrzciƄski2019-06-218-3/+257
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
| * | | | | | | | | | | | | | | | | Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-218-3/+257
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to support manual sorting on the frontend
* | | | | | | | | | | | | | | | | Merge branch 'dz-group-packages-page-ce' into 'master'Filipa Lacerda2019-06-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add packages nav to group sidebar [CE backport] See merge request gitlab-org/gitlab-ce!29592
| * | | | | | | | | | | | | | | | | Add packages nav to group sidebardz-group-packages-page-ceDmitriy Zaporozhets2019-06-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | Merge branch 'pages-domains-auth-ssl-flag' into 'master'Nick Thomas2019-06-2116-169/+303
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show private keys for letsencrypt certs See merge request gitlab-org/gitlab-ce!29359
| * | | | | | | | | | | | | | | | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-2116-169/+303
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds enum certificate_source to pages_domains table with default manually_uploaded Mark certificates as 'gitlab_provided' if the were obtained through Let's Encrypt Mark certificates as 'user_provided' if they were uploaded through controller or api Only show private key in domain edit form if it is 'user_provided' Only show LetsEncrypt option if is enabled by application settings (and feature flag) Refactor and fix some specs to match new logic Don't show Let's Encrypt certificates as well
* | | | | | | | | | | | | | | | | | Merge branch 'sanitize_rake_ldap_check_output' into 'master'Lin Jen-Shin2019-06-213-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize LDAP output in Rake tasks Closes #56131 See merge request gitlab-org/gitlab-ce!28427
| * | | | | | | | | | | | | | | | | | Sanitize LDAP output in Rake tasksDrew Blessing2019-06-213-2/+21
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various LDAP check Rake tasks have long supported a SANITIZE environment variable. When present, identifiable information is obscured such as user names and project/group names. Until now, the LDAP check did not honor this. Now it will only say how many users were found. This should at least give the indication that the LDAP configuration found something, but will not leak what it is. Resolves #56131
* | | | | | | | | | | | | | | | | | Merge branch 'docs/add-another-fdw-troubleshoot-item' into 'master'Achilleas Pipinellis2019-06-211-32/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new troubleshooting step and refactor Geo replication docs Closes #63210 See merge request gitlab-org/gitlab-ce!29783
| * | | | | | | | | | | | | | | | | | Add new troubleshooting step and refactor Geo replication docsEvan Read2019-06-211-32/+76
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'docs/fix-list-desc-templates' into 'master'Achilleas Pipinellis2019-06-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed formatting of notes bullet list See merge request gitlab-org/gitlab-ce!29923
| * | | | | | | | | | | | | | | | | | Fixed formatting of notes bullet listEvan Read2019-06-211-0/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'db/update-geo-nodes-primary' into 'master'Andreas Brandl2019-06-213-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow `NULL` values for `geo_nodes.primary` column Closes gitlab-ee#12061 See merge request gitlab-org/gitlab-ce!29818