summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document how to deploy serverless functions to aws lambdadoc-serverless-lambdaNicholas Klick2019-08-263-640/+679
|
* Merge branch 'update-babel-to-7.5.5' into 'master'Mike Greiling2019-08-203-22/+27
|\ | | | | | | | | Upgrade babel to 7.5.5 See merge request gitlab-org/gitlab-ce!31819
| * Upgrade babel to 7.5.5update-babel-to-7.5.5Takuya Noguchi2019-08-143-22/+27
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'ssh-add-no-redirect' into 'master'Achilleas Pipinellis2019-08-201-1/+1
|\ \ | | | | | | | | | | | | In ssh_keys docs, don't redirect stdout of ssh-add See merge request gitlab-org/gitlab-ce!31630
| * | Remove inoperative >/dev/nullAlexander Oleynikov2019-08-081-1/+1
| | |
* | | Merge branch 'docs-repository-languages-img' into 'master'Achilleas Pipinellis2019-08-203-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update repository languages screenshot See merge request gitlab-org/gitlab-ce!31925
| * | | Update repository languages screenshotMarcel Amirault2019-08-203-1/+1
|/ / /
* | | Merge branch 'winh-fix-mocks_helper_spec' into 'master'Mike Greiling2019-08-201-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Fix assertion in mocks_helper_spec.js See merge request gitlab-org/gitlab-ce!32005
| * | | Fix assertion in mocks_helper_spec.jsWinnie Hellmann2019-08-201-1/+3
|/ / /
* | | Merge branch 'sh-standardize-log-names' into 'master'Mayra Cabrera2019-08-2010-20/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Standardize remote_ip and path keys for auth.log and api_json.log Closes #66167 See merge request gitlab-org/gitlab-ce!31921
| * | | Standardize remote_ip and path keys for auth.log and api_json.logStan Hu2019-08-2010-20/+36
|/ / / | | | | | | | | | | | | | | | | | | | | | Current `auth.log` uses `fullpath` and `ip`, while `api_json.log` uses `remote_ip` and `path` for the same fields. Let's standardize these namings to make it easier for people working with the data. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66167
* | | Merge branch 'docs/rename-geo-pages' into 'master'Achilleas Pipinellis2019-08-202-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Harmonizes titles between two Geo landing pages See merge request gitlab-org/gitlab-ce!31944
| * | | Harmonizes titles between two Geo landing pagesEvan Read2019-08-202-3/+3
|/ / / | | | | | | | | | Menu entries in global navigation will be updated to match.
* | | Merge branch 'docs-integration-screenshots' into 'master'Achilleas Pipinellis2019-08-203-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update project import screenshot Closes #28826 See merge request gitlab-org/gitlab-ce!31946
| * | | Update project import docMarcel Amirault2019-08-203-7/+7
|/ / / | | | | | | | | | Update screenshot and improve text to match
* | | Merge branch 'docs/clarify-new-values' into 'master'Achilleas Pipinellis2019-08-201-2/+5
|\ \ \ | | | | | | | | | | | | | | | | Clarify when new values are valid See merge request gitlab-org/gitlab-ce!31951
| * | | Clarify when new values are validEvan Read2019-08-201-2/+5
|/ / /
* | | Merge branch '10943-css-clean-up-ee' into 'master'Annabel Dunstone Gray2019-08-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Adds a height utility class See merge request gitlab-org/gitlab-ce!32019
| * | | Adds a height utility class10943-css-clean-up-eeFilipa Lacerda2019-08-201-0/+1
| | | | | | | | | | | | | | | | Backports EE changes
* | | | Merge branch 'da/enable-dast-using-template' into 'master'Rémy Coutable2019-08-201-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable DAST See merge request gitlab-org/gitlab-ce!31970
| * | | | Enable DASTDennis Appelt2019-08-201-0/+10
|/ / / /
* | | | Merge branch 'remove-unused-security-fixtures' into 'master'Lin Jen-Shin2019-08-2018-4417/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused security fixtures Closes #62734 See merge request gitlab-org/gitlab-ce!31557
| * | | | Removed security fixtures as they are ee onlyremove-unused-security-fixturesCameron Swords2019-08-2019-5364/+1
| | | | | | | | | | | | | | | | | | | | These will be moved to the EE codebase.
* | | | | Merge branch 'bvl-mr-commit-note-counter' into 'master'Douwe Maan2019-08-204-14/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Count notes for commits and merge requests See merge request gitlab-org/gitlab-ce!31912
| * | | | | Count comments on notes and merge requestsBob Van Landuyt2019-08-164-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends our existing `Gitlab::UsageDataCounters::NoteCounter` to also count notes on commits and merge requests
* | | | | | Merge branch 'fix-deprecation-warnings-change-success-to-successful' into ↵Douglas Barbosa Alexandre2019-08-2020-54/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Change `be_success` to `be_successful` in specs See merge request gitlab-org/gitlab-ce!31969
| * | | | | | Change `be_success` to `be_successful` in specsfix-deprecation-warnings-change-success-to-successfulVitali Tatarintev2019-08-1920-54/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes deprecation warning: ``` DEPRECATION WARNING: The success? predicate is deprecated and will be removed in Rails 6.0. Please use successful? as provided by Rack::Response::Helpers. ```
* | | | | | | Merge branch 'rf-remove-gl-sast-report-json' into 'master'Yorick Peterse2019-08-201-861/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove file that was accidentally added back See merge request gitlab-org/gitlab-ce!32014
| * | | | | | | Remove file that was accidentally added backrossfuhrman2019-08-201-861/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file was moved to the EE project namespace, but https://gitlab.com/gitlab-org/gitlab-ce/commit/ce50d5c45158723925b098f7e0033963841137ff brought it back. It should not be present in this repo.
* | | | | | | Merge branch 'pb-update-gitlab-shell-9-4-0' into 'master'Nick Thomas2019-08-202-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to GitLab Shell v9.4.0 See merge request gitlab-org/gitlab-ce!32009
| * | | | | | | Update to GitLab Shell v9.4.0Patrick Bajao2019-08-202-1/+6
| | | | | | | |
* | | | | | | | Merge branch ↵Filipa Lacerda2019-08-202-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62373-badge-counter-very-low-contrast-between-foreground-and-background-colors-2' into 'master' Resolve "Badge counter: Very low contrast between foreground and background colors" Closes #62373 See merge request gitlab-org/gitlab-ce!31922
| * | | | | | | | Resolve "Badge counter: Very low contrast between foreground and background ↵Jeremy Elder2019-08-202-1/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | colors"
* | | | | | | | Merge branch 'tr-param-undefined-fix' into 'master'Clement Ho2019-08-203-2/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Embed metrics undefined param fix Closes #66177 See merge request gitlab-org/gitlab-ce!31975
| * | | | | | | Embed metrics undefined param fixTristan Read2019-08-203-2/+27
|/ / / / / / /
* | | | | | | Merge branch 'an-fix-sidekiq-histogram-buckets' into 'master'61061-links-to-sha-commits-in-release-notes-don-t-display-in-the-new-releases-page-but-do-display-on-the-tags-pageKamil Trzciński2019-08-203-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow measurement of sidekiq jobs taking > 2.5s See merge request gitlab-org/gitlab-ce!32001
| * | | | | | | Allow measurement for Sidekiq jobs taking > 2.5sAndrew Newdigate2019-08-203-2/+11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/66319.
* | | | | | | Merge branch 'rf-move-sast-reports-to-mr-widget-backend' into 'master'Paul Slaughter2019-08-201-86/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move SAST reports logic for MR widget to backend See merge request gitlab-org/gitlab-ce!31770
| * | | | | | | Move SAST reports logic for MR widget to backendrossfuhrman2019-08-201-86/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Update spec that is changed in corresponding EE MR
* | | | | | | Merge branch 'sh-fix-issues-api-gitaly-nplusone' into 'master'Sean McGivern2019-08-207-5/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gitaly N+1 calls with listing issues/MRs via API Closes #66202 See merge request gitlab-org/gitlab-ce!31938
| * | | | | | Fix Gitaly N+1 calls with listing issues/MRs via APIsh-fix-issues-api-gitaly-nplusoneStan Hu2019-08-177-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GitLab 9.0, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9661 removed the `subscribed` flag from the API when the user requested a list of issues or merge requests since calculating this value triggers extensive Markdown processing. In GitLab 12.0 via a4fbf39e, we accidentally reintroduced this performance regression by changing `IssueBasic` to `Issue` in `entities.rb`. This showed up as a Gitaly N+1 issue since the Markdown processing would attempt to extract a commit if it detected a regex that matched a commit. We restore the prior behavior by once again removing the `subscribed` flag for the bulk list of issues and merge requests and add a test to ensure they aren't reintroduced. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66202
* | | | | | | Merge branch 'docs-testing-n-1-request-sepcs' into 'master'Lin Jen-Shin2019-08-202-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Require request specs when testing N+1 for controllers See merge request gitlab-org/gitlab-ce!31940
| * | | | | | | Require request specs when testing N+1 for controllersThong Kuah2019-08-202-1/+8
| |/ / / / / /
* | | | | | | Merge branch 'pl-remove-virtus' into 'master'Thong Kuah2019-08-206-37/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer ActiveModel's attributes over Virtus See merge request gitlab-org/gitlab-ce!31835
| * | | | | | | Use ActiveModel's type instead of virtusPeter Leitzen2019-08-206-37/+46
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The virtus project has been discontinued: https://github.com/solnic/virtus/commit/a6f896984
* | | | | | | Merge branch 'kp-add-vue-input-autofocus-directive' into 'master'Filipa Lacerda2019-08-202-0/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `autofocusonshow` directive for input elements See merge request gitlab-org/gitlab-ce!31584
| * | | | | | | Add `autofocus` directive for input elementskp-add-vue-input-autofocus-directiveKushal Pandya2019-08-192-0/+77
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fe-fix-merge-url-params-with-plus' into 'master'Kushal Pandya2019-08-204-6/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `mergeUrlParams` handling of '+' Closes #66152 See merge request gitlab-org/gitlab-ce!31973
| * | | | | | | Add feature spec for search with spacefe-fix-merge-url-params-with-plusminghuan lei2019-08-191-5/+25
| | | | | | | |
| * | | | | | | Fix mergeUrlParams handling of `+`Paul Slaughter2019-08-193-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What was the issue?** If a param value had `+`, it would be encoded as a literal `+` instead of a space.