summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply suggestion to lib/gitlab/sentry.rbsentry-extra-dataAlex Kalderimis2019-08-191-0/+1
|
* Reduce complexity of track_acceptable_exceptionAlex Kalderimis2019-08-161-4/+10
| | | | This moves extra-data computation out into a private class method
* Add support for sentry_extra_data in exceptionsAlex Kalderimis2019-08-162-2/+35
| | | | | This allows exceptions to advertise their support for sentry and provide structured data.
* Merge branch 'mc/feature/pipeline-tracking-config-ce' into 'master'Kamil Trzciński2019-08-169-9/+65
|\ | | | | | | | | | | | | Add `needs:` CI config option CE Closes gitlab-ee#12334 See merge request gitlab-org/gitlab-ce!31346
| * Port changes from EEmc/feature/pipeline-tracking-config-ceMatija Čupić2019-08-049-9/+65
| | | | | | | | | | Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12343
* | Merge branch 'fix/commits-api-empty-refname' into 'master'Nick Thomas2019-08-163-1/+12
|\ \ | | | | | | | | | | | | | | | | | | fix handling of empty ref_name parameter string in commits api Closes #64745 See merge request gitlab-org/gitlab-ce!31687
| * | remove encoding comment created by emacs ruby-modeArmin Hohenegger2019-08-131-1/+0
| | |
| * | add a test for empty ref_name to api commits specArmin Hohenegger2019-08-131-0/+7
| | |
| * | fix handling of empty ref_name parameter string in commits apiArmin Hohenegger2019-08-102-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | when params[:ref_name] is set to "" by passing an empty query parameter to the api it is evaluated as false by the || operator. The use of active support core extensions presence method fixes the original implemantation. https://guides.rubyonrails.org/active_support_core_extensions.html#presence
* | | Merge branch 'patch-31' into 'master'Nick Thomas2019-08-161-9/+0
|\ \ \ | | | | | | | | | | | | | | | | Removed duplicate Live preview entry for MR docs See merge request gitlab-org/gitlab-ce!31763
| * | | Removed duplicate Live preview entry for MR docsPhilipp Hasper2019-08-131-9/+0
| | | |
* | | | Merge branch '12111-snippet-index-ee-docs' into 'master'Grzegorz Bizon2019-08-161-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Doc: sync ES updates See merge request gitlab-org/gitlab-ce!31883
| * | | | Doc: sync ES updates12111-snippet-index-ee-docsMark Chao2019-08-161-0/+4
| | | | |
* | | | | Merge branch '56130-deployment-date' into 'master'Grzegorz Bizon2019-08-165-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose finished_at for the Deployment entity See merge request gitlab-org/gitlab-ce!31808
| * | | | | Add finished_at to the internal API Deployment entity56130-deployment-dateKrasimir Angelov2019-08-155-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/56130.
* | | | | | Merge branch ↵Grzegorz Bizon2019-08-1613-33/+311
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flow' into 'master' Soft email confirmation flow Closes #47003 See merge request gitlab-org/gitlab-ce!31245
| * | | | | | Incorporate feedback fixes47003-user-onboarding-replace-current-email-confirmation-flow-with-a-soft-email-confirmation-flowAlex Buijs2019-08-122-2/+10
| | | | | | |
| * | | | | | Fix invite specAlex Buijs2019-08-081-14/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invitation flow changed a bit, because now there is no more need to sign in after confirming. When signing up with a different email address, the user will see the invitation page straight after signing up when redirected, without needing to sign in.
| * | | | | | Add locale translationsAlex Buijs2019-08-081-0/+9
| | | | | | |
| * | | | | | Add some feature specsAlex Buijs2019-08-081-0/+35
| | | | | | |
| * | | | | | Don't redirect to the Almost there pageAlex Buijs2019-08-084-18/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't redirect to the Almost there page after registration and after resending confirmation instructions
| * | | | | | Set Devise's allow_unconfirmed_access_forAlex Buijs2019-08-082-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to 30 days
| * | | | | | Add ConfirmEmailWarning concernAlex Buijs2019-08-083-0/+124
| | | | | | |
| * | | | | | Set cursor to default for warning flashAlex Buijs2019-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the warning flash is not clickable, set the cursor to default
* | | | | | | Merge branch 'add-rate-limiter-on-raw-endpoint-docs' into 'master'Marcia Ramos2019-08-163-2/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for rate limiter on raw endpoints See merge request gitlab-org/gitlab-ce!31723
| * | | | | | | Add docs for rate limiter on raw endpointsMayra Cabrera2019-08-163-2/+23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The section was included on security/raw_limits and on the admin area settings. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/48717
* | | | | | | Merge branch 'docs-lists-cleanup-3' into 'master'Marcia Ramos2019-08-1612-121/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust headers in /university See merge request gitlab-org/gitlab-ce!31702
| * | | | | | | Adjust headers in /universityMarcel Amirault2019-08-1612-121/+18
|/ / / / / / /
* | | | | | | Merge branch 'docs-styleguide-codeblocks' into 'master'Marcia Ramos2019-08-163-14/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs style for code blocks Closes #65373 See merge request gitlab-org/gitlab-ce!31297
| * | | | | | | Update docs style for code blocksMarcel Amirault2019-08-163-14/+16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify rules for code blocks, including spaces above and below, and to use tilde when code blocks contain triple backticks
* | | | | | | Merge branch 'dm-fix-quarantined-spec' into 'master'Nick Thomas2019-08-161-5/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quarantined spec by waiting for requests Closes #65329 See merge request gitlab-org/gitlab-ce!31862
| * | | | | | | Fix quarantined spec by waiting for requestsdm-fix-quarantined-specDouwe Maan2019-08-151-5/+2
| | | | | | | |
* | | | | | | | Merge branch '61335-fix-file-icon-status' into 'master'Filipa Lacerda2019-08-165-72/+129
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Web IDE uncommitted files use wrong icon in tree" Closes #61335 See merge request gitlab-org/gitlab-ce!31560
| * | | | | | | | Rewrite changed_file_icon_spec in JestPaul Slaughter2019-08-165-72/+129
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Uses vue-test-utils - More complete coverage with parameterized tests
* | | | | | | | Merge branch 'add-feature-flag-cleanup-to-template' into 'master'Marin Jankovski2019-08-161-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document cleanup of feature flag after deploy See merge request gitlab-org/gitlab-ce!31893
| * | | | | | | | Document cleanup of feature flag after deployHeinrich Lee Yu2019-08-161-0/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'enable-dag-support-by-default' into 'master'Kamil Trzciński2019-08-162-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable DAG support by default Closes #65457 See merge request gitlab-org/gitlab-ce!31814
| * | | | | | | | Enable DAG support by defaultenable-dag-support-by-defaultKamil Trzciński2019-08-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This toggles the ci_dag_support flag to be on by default. This relies on ci_dag_limit_needs to be present to reduce amount of inter-dependencies between jobs
* | | | | | | | | Merge branch 'do-not-vendor-go-mod' into 'master'Grzegorz Bizon2019-08-161-0/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use go mod vendor See merge request gitlab-org/gitlab-ce!31721
| * | | | | | | | | Don't use go mod vendorNick Thomas2019-08-121-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change comes out of a discussion between Ben Kochie and me, around this MR: https://gitlab.com/gitlab-org/gitlab-pages/merge_requests/164 gitlab-elasticsearch-indexer already uses `go mod` without a `vendor/` directory. It has caused some intermittent build failures in the gitlab-ce/ee CI pipelines, but has otherwise been fine. I think that treating our Go dependencies in the same way we do our Ruby or Node.js ones is reasonable, and it has some minor benefits: * Contributors find it easier to submit MRs * MRs are easier to review * Makefiles are easier to write
* | | | | | | | | | Merge branch 'ce-issue_12619' into 'master'Jan Provaznik2019-08-162-0/+159
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Backport] Add feature specs for multiple issue boards for groups See merge request gitlab-org/gitlab-ce!31481
| * | | | | | | | | | Add feature specs for multiple group issue boardsFelipe Artur2019-08-162-0/+159
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature specs for multiple issue boards for groups
* | | | | | | | | | Merge branch 'fe-add-unbinds-to-discussion-keyboard-navigator' into 'master'Kushal Pandya2019-08-163-0/+35
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add key unbinds to DiscussionKeyboardNavigator See merge request gitlab-org/gitlab-ce!31857
| * | | | | | | | | | Add key unbinds to DiscussionKeyboardNavigatorfe-add-unbinds-to-discussion-keyboard-navigatorPaul Slaughter2019-08-153-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds comment to explain why this works on the diff-tab when it's only used in `notes-app`. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30144#note_204066538
* | | | | | | | | | | Merge branch 'docs-arm64-k8s-support' into 'master'Evan Read2019-08-161-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about the lack of arm64 support See merge request gitlab-org/gitlab-ce!31887
| * | | | | | | | | | | Add a note about the lack of arm64 supportAlexander Tanayno2019-08-161-0/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/profile-security-dashboard' into 'master'Evan Read2019-08-161-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document option to set Security Dashboard as default view for groups See merge request gitlab-org/gitlab-ce!31795
| * | | | | | | | | | | Document option to set Security Dashboard as default view for groupsAchilleas Pipinellis2019-08-161-0/+10
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'productivity-analytics-docs-revert' into 'master'Evan Read2019-08-161-69/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert adding productivity analytics docs See merge request gitlab-org/gitlab-ce!31848
| * | | | | | | | | | | Revert adding productivity analytics docsMartin Wortschack2019-08-161-69/+0
|/ / / / / / / / / / /