summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-3114-31/+0
|
* Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'Grzegorz Bizon2018-10-313-15/+53
|\ | | | | | | | | | | | | Send continue parameter on for `cancel_path` Closes #53335 See merge request gitlab-org/gitlab-ce!22712
| * Use array syntax instead of dig for consistencySteve Azzopardi2018-10-311-1/+1
| | | | | | | | We are using hash[symbol][symbol] everywhere else in the test file.
| * Send continue parameter on for cancel_pathSteve Azzopardi2018-10-313-14/+52
| | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595 `ContinueParams` was introducted in the `Projects::JobController#cancel` since `continue` parameter is not present for in `cancel_path` for `Projects::JobController#show.sjon` the user is being redirect to the pipeline page, where it should be redirected to the current job page instead. Add the `continue` parameter as a query string for `cancel_path`.
* | Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-313-5/+9
|\ \ | | | | | | | | | | | | Remove EE-specific code from 'Discussion' models See merge request gitlab-org/gitlab-ce!22687
| * | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-263-5/+9
| | |
* | | Merge branch 'gl-ui-pagination' into 'master'Phil Hughes2018-10-313-2/+9
|\ \ \ | | | | | | | | | | | | | | | | Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704
| * | | Remove gitlab-ui's pagination from globalgl-ui-paginationClement Ho2018-10-303-2/+9
| | | |
* | | | Merge branch 'gl-ui-modal' into 'master'Phil Hughes2018-10-314-8/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's modal from global See merge request gitlab-org/gitlab-ce!22706
| * | | | Remove gitlab-ui's modal from globalClement Ho2018-10-314-8/+18
|/ / / /
* | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master'Phil Hughes2018-10-315-7/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix typos in IDE props See merge request gitlab-org/gitlab-ce!22685
| * | | | Fix typos in IDE propsGeorge Tsiolis2018-10-305-7/+12
| | | | |
* | | | | Merge branch '53386-broken-master' into 'master'Phil Hughes2018-10-311-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds required prop to the post merge pipeline Closes #53386 See merge request gitlab-org/gitlab-ce!22715
| * | | | | Adds required prop to the post merge pipeline53386-broken-masterFilipa Lacerda2018-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline
* | | | | | Merge branch 'ce-7927-filter-none-any-weight-issues-api' into 'master'Sean McGivern2018-10-311-4/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Split CE and EE params in issues API See merge request gitlab-org/gitlab-ce!22689
| * | | | | Extract EE params in issues API to separate moduleHeinrich Lee Yu2018-10-301-4/+13
| | | | | |
* | | | | | Merge branch 'docs/rs-implicit-feature-flags' into 'master'Sean McGivern2018-10-311-10/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document implicit feature flag checks Closes gitlab-org/release/framework#26 See merge request gitlab-org/gitlab-ce!22669
| * | | | | | Document implicit feature flag checksdocs/rs-implicit-feature-flagsRobert Speicher2018-10-291-10/+23
| | | | | | |
* | | | | | | Merge branch ↵Filipa Lacerda2018-10-3111-6/+70
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
| * | | | | | Copyedit documentation updates41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-againMatija Čupić2018-10-291-1/+16
| | | | | | |
| * | | | | | Fix rspec error text regexMatija Čupić2018-10-243-4/+5
| | | | | | |
| * | | | | | Fix wording in troubleshooting docsMatija Čupić2018-10-241-5/+9
| | | | | | |
| * | | | | | Regenerates pot filesFilipa Lacerda2018-10-245-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes documentation path a required prop
| * | | | | | Updates CI/CD documentation link in MR widgetFilipa Lacerda2018-10-243-3/+18
| | | | | | |
| * | | | | | Fix the troubleshooting docs linkMatija Čupić2018-10-243-4/+3
| | | | | | |
| * | | | | | Add docs linkMatija Čupić2018-10-243-1/+4
| | | | | | |
| * | | | | | Add CHANGELOG entryMatija Čupić2018-10-241-0/+5
| | | | | | |
| * | | | | | Add troubleshooting section to MR docsMatija Čupić2018-10-241-0/+10
| | | | | | |
| * | | | | | Change CI status error messageMatija Čupić2018-10-244-4/+4
| | | | | | |
* | | | | | | Merge branch 'rpereira2_improve-usage-ping-info' into 'master'Evan Read2018-10-311-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instructions to find the usage ping payload See merge request gitlab-org/gitlab-ce!22571
| * | | | | | | Add instructions to find the usage ping payloadReuben Pereira2018-10-311-1/+5
|/ / / / / / /
* | | | | | | Merge branch '52992-absorb-qa-product-qa' into 'master'Douglas Barbosa Alexandre2018-10-3115-165/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Absorb product into factory See merge request gitlab-org/gitlab-ce!22698
| * | | | | | | CE: Absorb product into factoryLin Jen-Shin2018-10-3115-165/+55
|/ / / / / / /
* | | | | | | Merge branch 'docs/refactor-backup' into 'master'Evan Read2018-10-311-91/+224
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the backup/restore docs See merge request gitlab-org/gitlab-ce!22576
| * | | | | | | Refactor the backup/restore docsdocs/refactor-backupAchilleas Pipinellis2018-10-301-91/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rearrange sections - Stress out the importance of storing config files - Add troubleshooting guide in case secrets is lost
* | | | | | | | Merge branch 'docs-add-existing-k8s-integration-info' into 'master'Evan Read2018-10-301-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added info on getting k8s integration for existing cluster See merge request gitlab-org/gitlab-ce!21783
| * | | | | | | | Added periods and modified numberingdocs-add-existing-k8s-integration-infoJason Colyer2018-10-301-4/+4
| | | | | | | | |
| * | | | | | | | Added Evan's suggestionsJason Colyer2018-10-241-12/+7
| | | | | | | | |
| * | | | | | | | Updated commands and order from MR recomendationsJason Colyer2018-10-111-4/+4
| | | | | | | | |
| * | | | | | | | Added info on getting k8s integration for existing clusterJason Colyer2018-09-171-0/+13
| | | | | | | | |
* | | | | | | | | Merge branch '53052-mg-fix-broken-ie11' into 'master'Clement Ho2018-10-303-5/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken ie11 due to non-transpiled components in gitlab-ui Closes #53052 See merge request gitlab-org/gitlab-ce!22695
| * | | | | | | | Add changelog entry for !2269553052-mg-fix-broken-ie11Mike Greiling2018-10-301-0/+5
| | | | | | | | |
| * | | | | | | | Upgrade gitlab-ui to latestMike Greiling2018-10-302-5/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-3028-125/+289
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add language param to highlight See merge request gitlab-org/gitlab-ce!21584
| * | | | | | | | | Allow search results to accept project_idadd-language-param-to-highlightMark Chao2018-10-301-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives flexiblity to avoid duplicated query of Project.
| * | | | | | | | | Centralize loading blob data before highlightingMark Chao2018-10-301-0/+2
| | | | | | | | | |
| * | | | | | | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-307-31/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
| * | | | | | | | | Move :plain option to Highlight classMark Chao2018-10-309-88/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to DRY the repeated file size check. Move spec and constants to Highlight
| * | | | | | | | | Make Highlight accept language paramMark Chao2018-10-3016-56/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob.
| * | | | | | | | | Add BlobPresenter for highlightingMark Chao2018-10-304-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force FoundBlob to use BlobPresenter
View Lorry Controller Status