summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Switch from currentUser to userCanReply63559-remove-avatar-from-sign-inMarcel van Remmerden2019-06-212-1/+6
|
* 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
| * \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↔Arun Kumar Mohan2019-06-20175-1010/+1252
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | db/update-geo-nodes-primary
| * | | | | | | | | Add changelog entryArun Kumar Mohan2019-06-181-0/+5
| | | | | | | | | |
| * | | | | | | | | Disallow `NULL` values for `geo_nodes.primary` columnArun Kumar Mohan2019-06-182-2/+22
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'paginate-license-management' into 'master'Filipa Lacerda2019-06-217-0/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport and Docs for Paginate license management and add license search See merge request gitlab-org/gitlab-ce!27602
| * | | | | | | | | Paginate license management and add license searchpaginate-license-managementFernando2019-06-207-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at license pagination * Paginate license management client side * Refactor license list into seperate component Add string filtering to license names * Add search input to query on license name Add add license button * Refactor add license button to be a slot Clean up styles and button state logic * Clean up alignment * Disable button when dorpdown is open Remove client side alphabetical sorting * Let the databse return order by date Refactor list to use row slot Further abstract pagination list compnent Finish refactor of paginated list * Refactor component into generic paginated list component * Add additional style tweaks + responsive classes Run prettier Update license_management_spec Run Prettier Add unit tests for paginated list component * Refactor template to be valid html (li in ul) * Add jest unit tests Add additional unit tests * Add unit tests around pagination and search states Add unit tests for filter props Pretty print, lint, and add changelog Update po files Regernate pot file Backport EE changes * Update paginated list component * Update specs and snapshot Add POT file Update default copy for pagianted list * update copy for empty and empty search result states Update pot file Backport changes from EE merge request * Paginaed list component and specs Backport EE changes Update paginated list snapshot Update license management docs and images Backport paginated-list component from EE Link to gitlab-ui artifacts job Match gitlab ui build to EE Update pot file Backport Paginated list changes Set gitlab-ui to temp artifact Add changelog
* | | | | | | | | | Merge branch '59028-fix-extra-plus-in-diffs' into 'master'Phil Hughes2019-06-213-1/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add back trimChar method to remove trailing +/- Closes #59028 See merge request gitlab-org/gitlab-ce!29518
| * | | | | | | | | Add back trimChar method to remove trailing +/-Samantha Ming2019-06-213-1/+24
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test for checking output
* | | | | | | | | Merge branch '63507-fix-race-condition-fetching-token' into 'master'Douwe Maan2019-06-214-9/+95
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Race condition in fetching Kubernetes token causes missing `$KUBECONFIG`" Closes #63507 See merge request gitlab-org/gitlab-ce!29922
| * | | | | | | | | Retry fetching Kubernetes Secret tokenDylan Griffith2019-06-214-9/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Kubernetes is creating the Secret and token asynchronously it is necessary that we implement some delay or retrying logic to avoid a race condition where we fetch a Secret before the token is even set. There does not appear to be any way for us to force it to be set with any synchronous API call so retrying seems to be the only option.
* | | | | | | | | | Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'Kamil TrzciƄski2019-06-213-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled complex ci variable expression statements by default See merge request gitlab-org/gitlab-ce!29904
| * | | | | | | | | | Enabled complex ci variable expression statements by defaultdefault-enable-complex-ci-variables-expressionsdrew cimino2019-06-203-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'bug/63162-duplicate_path_in_links' into 'master'Sean McGivern2019-06-214-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rewrite relative links for system notes Closes #63162 See merge request gitlab-org/gitlab-ce!29825
| * | | | | | | | | | | Do not rewrite relative links for system notesbug/63162-duplicate_path_in_linksMario de la Ossa2019-06-204-1/+15
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-kubernetes-service-deployment-platform' into 'master'Thong Kuah2019-06-216-106/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Kubernetes service from deployment platform See merge request gitlab-org/gitlab-ce!29786
| * | | | | | | | | | | | Update KubernetesService deprecation warningremove-kubernetes-service-deployment-platformTiger2019-06-214-16/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove Kubernetes service from deployment platformTiger2019-06-214-91/+8
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will no longer be used for deployments, as all service templates have been migrated to clusters.
* | | | | | | | | | | | Merge branch 'wording-docs' into 'master'Evan Read2019-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Change wording See merge request gitlab-org/gitlab-ce!29746