summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Backport EE changes to ProjectSearchResultslib-differencesYorick Peterse2019-08-081-1/+3
| | | | | EE made some changes to the project_ids_relation method, but these were not backported to CE.
* Backport EE changes to the project import APIYorick Peterse2019-08-081-0/+1
| | | | | | EE added a single line to this file that can easily be backported to CE, but it appears this was overlooked. The method called is a noop in CE, so no additional changes are necessary.
* Merge branch '63181-collapsible-line' into 'master'Kushal Pandya2019-08-081-2/+2
|\ | | | | | | | | | | | | Makes section title clickable and collapsible Closes #63181 See merge request gitlab-org/gitlab-ce!31571
| * Makes title section collapsible63181-collapsible-lineFilipa Lacerda2019-08-071-2/+2
| | | | | | | | | | In the job log, if the user clicks the section title the job log section will be collapsed
* | Merge branch 'patch-71' into 'master'Grzegorz Bizon2019-08-081-2/+0
|\ \ | | | | | | | | | | | | Remove duplicated line from Maven CI template See merge request gitlab-org/gitlab-ce!31440
| * | Remove duplicated line from Maven CI templateZsolt Kovari2019-08-031-2/+0
| | |
* | | Merge branch '20137-starrers' into 'master'Stan Hu2019-08-082-0/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add possibilty to view starrers ("stargazers") of a repository & any user's starred repositories Closes #20137 See merge request gitlab-org/gitlab-ce!24690
| * | | Fix testsCamil Staps2019-08-071-1/+1
| | | |
| * | | Expose time since starring on project/:id/starrers API endpoint; exclude ↵Camil Staps2019-08-072-4/+8
| | | | | | | | | | | | | | | | private profiles here as well
| * | | Fix API endpoint for starred projects of a user; add info about starred ↵Camil Staps2019-08-071-1/+1
| | | | | | | | | | | | | | | | projects on profile to documentation
| * | | Add documentation and changelog for !24690Camil Staps2019-08-071-4/+6
| | | |
| * | | Add users/:user_id/starred_projects API endpoint for projects starred by a userCamil Staps2019-08-071-0/+16
| | | |
| * | | Add projects/:id/starrers API endpoint for users who starred a repositoryCamil Staps2019-08-071-0/+12
| | | |
* | | | Merge branch 'sh-add-missing-csp-report-uri' into 'master'Mayra Cabrera2019-08-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing report-uri to CSP config See merge request gitlab-org/gitlab-ce!31593
| * | | | Add missing report-uri to CSP configsh-add-missing-csp-report-uriStan Hu2019-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This is supported in Rails 5.2, although it may be deprecated in the future by reports-to.
* | | | | Checksum clair executablePhilippe Lafoucrière2019-08-071-0/+2
| |/ / / |/| | |
* | | | Save instance administration project id in DBReuben Pereira2019-08-071-0/+5
| | | | | | | | | | | | | | | | | | | | - This will make it easy to identify the project even if admins change the name of the project or move it.
* | | | Support dashboard params for metrics dashboardSarah Yasonik2019-08-076-23/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/62971 Adds support to EnvironmentsController#metrics_dashboard for the following params: group, title, y_label These params are used to uniquely identify a panel on the metrics dashboard. Metrics are stored in several places, so this adds utilities to find a specific panel from the database or filesystem depending on the metric specified. Also moves some shared utilities into separate classes, notably default values and errors.
* | | | Initial commit of WIP code for considerationKerri Miller2019-08-073-21/+32
| | | | | | | | | | | | | | | | Squash this commit and reword before merging..
* | | | Use Git 2.22 for GitLabZeger-Jan van de Weg2019-08-071-1/+1
|/ / / | | | | | | | | | Part of: https://gitlab.com/gitlab-org/gitaly/issues/1715
* | | Merge branch 'sh-support-csp-nonce' into 'master'Ash McKenzie2019-08-071-0/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for Content-Security-Policy Closes #65330 See merge request gitlab-org/gitlab-ce!31402
| * | | Add support for Content-Security-PolicyStan Hu2019-08-071-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A nonce-based Content-Security-Policy thwarts XSS attacks by allowing inline JavaScript to execute if the script nonce matches the header value. Rails 5.2 supports nonce-based Content-Security-Policy headers, so provide configuration to enable this and make it work. To support this, we need to change all `:javascript` HAML filters to the following form: ``` = javascript_tag nonce: true do :plain ... ``` We use `%script` throughout our HAML to store JSON and other text, but since this doesn't execute, browsers don't appear to block this content from being used and require the nonce value to be present.
* | | | Use separate Kubernetes namespaces per environmentTiger Watson2019-08-073-9/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubernetes deployments on new clusters will now have a separate namespace per project environment, instead of sharing a single namespace for the project. Behaviour of existing clusters is unchanged. All new functionality is controlled by the :kubernetes_namespace_per_environment feature flag, which is safe to enable/disable at any time.
* | | | Convert RestClient to Gitlab::HTTP for Prometheus MonitorDavid Wilkins2019-08-072-36/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Closes #60024 - Change PrometheusClient.new to accept a base url instead of an already created RestClient - Use Gitlab::HTTP in PrometheusClient instead of creating RestClient in PrometheusService - Move http_options from PrometheusService to PrometheusClient (follow_redirects: false) - ensure that base urls don't have the trailing slash - Created a `PrometheusClient#url` method that might not be strictly required - Change rescued exceptions from RestClient::* to HTTParty::ResponseError where possible and StandardError for the rest
* | | | Update Packer.gitlab-ci.yml to use latest imageKelly Hair2019-08-061-1/+1
| | | |
* | | | Merge branch '65152-selective-highlight' into 'master'Bob Van Landuyt2019-08-062-7/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Support selective highlighting of lines See merge request gitlab-org/gitlab-ce!31361
| * | | Support selective highlighting of lines65152-selective-highlightPatrick Bajao2019-08-062-7/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of highlighting all lines when not all of them are needed, only highlight specific lines. The `BlobPresenter#highlight` method has been updated to support `since` and `to` params. These params will be used to limit the content to be highlighted. Modify `Gitlab::Highlight` to support `since` param which will then be used to determine the starting line number.
* | | Merge branch 'make-issue-boards-importable' into 'master'Sean McGivern2019-08-061-0/+6
|\ \ \ | |/ / |/| | | | | | | | Make issue boards importable See merge request gitlab-org/gitlab-ce!31434
| * | Make Issue boards importableJason Colyer2019-08-051-3/+0
| | | | | | | | | | | | | | | - Added space to li definiton - Remove milestone from import_export.yml
| * | Make issue boards importableJason Colyer2019-08-021-0/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | - Added Importable to models/list.rb - Did unless: :importable? on board validation - Created changelog - Modified haml to show issue boards are importable - Added needed spec tests - Modified project.json to include board information - Added relevant models to all_models - Added relevant models to import_export - Added relevant models to safe_model_attributes
* | Fix error on project nameGosia Ksionek2019-08-058-21/+28
| | | | | | | | Add project path to sql query to build proper path
* | Add group level container repository endpointsSteve Abrams2019-08-054-14/+59
| | | | | | | | | | | | | | API endpoints for requesting container repositories and container repositories with their tag information are enabled for users that want to specify the group containing the repository rather than the specific project.
* | Merge branch 'sh-disable-redis-peek' into 'master'Douglas Barbosa Alexandre2019-08-051-0/+5
|\ \ | | | | | | | | | | | | Only track Redis calls if Peek is enabled See merge request gitlab-org/gitlab-ce!31438
| * | Only track Redis calls if Peek is enabledsh-disable-redis-peekStan Hu2019-08-021-0/+5
| |/ | | | | | | | | | | | | | | In dev environments, Sidekiq was encountering the message: Circular dependency detected while autoloading constant Gitlab::Profiler This saves some overhead during normal usage.
* | Merge branch 'add-missing-timezone-legacy-artifacts' into 'master'Stan Hu2019-08-051-6/+12
|\ \ | | | | | | | | | | | | Add missing timezone when copying legacy artifacts (ci_builds) See merge request gitlab-org/gitlab-ce!31447
| * | Add missing timezone to legacy artifacts (ci_builds)David H. Wilkins2019-08-041-6/+12
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | - ci_builds.artifacts_expire_at are copied to ci_job_artifacts.expire_at with incorrect timestamps when the database timezone is NOT utc - ci_builds.artifacts_expire_at is `timestamp without time zone` and ci_job_artifacts.expire_at is `timestamp with time zone` on postgresql - Tests fail locally for `rspec ./spec/lib/gitlab/import_export/import_export_spec.rb` without this change
* | Merge branch 'georgekoltsov/55474-outbound-setting-system-hooks' into 'master'Rémy Coutable2019-08-055-4/+12
|\ \ | | | | | | | | | | | | Add outbound setting for system hooks See merge request gitlab-org/gitlab-ce!31177
| * | Add backwards compatibility for legacy settingGeorge Koltsov2019-08-022-0/+8
| | | | | | | | | | | | | | | `allow_local_requests_for_hooks_and_services` was renamed to `allow_local_requests_for_web_hooks_and_services`.
| * | Refactor SystemHookUrlValidator and specsGeorge Koltsov2019-08-021-1/+1
| | | | | | | | | | | | | | | | | | Simplify SystemHookUrlValidator to inherit from PublicUrlValidator Refactor specs to move out shared examples to be used in both system hooks and public url validators.
| * | Add outbound requests setting for system hooksGeorge Koltsov2019-08-022-3/+3
| | | | | | | | | | | | | | | | | | | | | This MR adds new application setting to network section `allow_local_requests_from_system_hooks`. Prior to this change system hooks were allowed to do local network requests by default and we are adding an ability for admins to control it.
* | | Merge branch 'GL-12757' into 'master'Sean McGivern2019-08-051-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Increase clair scanner from v11 to v12 See merge request gitlab-org/gitlab-ce!30809
| * | | increase clair local scan versionmo2019-08-021-1/+1
| | | |
| * | | increase clair from v11 to v12mo2019-08-021-1/+1
| | |/ | |/|
* | | Set DOCKER_TLS_CERTDIR in CI job templatesCameron Boulton2019-08-051-0/+1
|/ /
* | Implement Helm ResetCommand for removing TillerDylan Griffith2019-08-022-11/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | Also creates specs Only allow Helm to be uninstalled if it's the only app - Remove Tiller leftovers after reser command - Fixes specs and offenses Adds changelog file Fix reset_command specs
* | Merge branch 'make-needs-strong-connection' into 'master'Sean McGivern2019-08-022-12/+38
|\ \ | | | | | | | | | | | | | | | | | | Make `needs:` to require a strong reference Closes #65512 See merge request gitlab-org/gitlab-ce!31419
| * | Make needs: to require previous jobsmake-needs-strong-connectionKamil Trzciński2019-08-022-12/+38
| |/ | | | | | | | | | | | | | | | | This changes `needs:` from weak reference to have a strong reference. This means that job will not be created unless all needs are present as part of a pipeline.
* | Merge branch '17276-breakage-in-displaying-svg-in-the-same-repository' into ↵Robert Speicher2019-08-021-1/+1
|\ \ | |/ |/| | | | | | | | | 'master' Resolve "Breakage in displaying SVG in the same repository" See merge request gitlab-org/gitlab-ce!31352
| * Fix inline rendering of SVGs from current repo17276-breakage-in-displaying-svg-in-the-same-repositoryHeinrich Lee Yu2019-08-021-1/+1
| | | | | | | | Changes generated URL to raw instead of blob
* | Prevent empty classes in ansi2html conversionLukas '+ alert('Eipi') + ' Eipert2019-08-021-10/+17
| | | | | | | | | | | | | | Currently we write out empty CSS classes (`class=""`) every time we create a new tag. This adds 9 unnecessary bytes per span element. In a recent trace, I have counted 11950 span elements. So we transported 105 unnecessary kilobytes!
View Lorry Controller Status