summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add GraphQL filters for issuables (state, labels, time fields)56492-implement-new-arguments-state-closed_before-and-closed_after-for-issuesresolver-in-graphqlRémy Coutable2019-02-0513-14/+161
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Allow IssuableFinder to filter by closed_atRémy Coutable2019-02-054-0/+53
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'mj/security-mr-template' into 'master'Yorick Peterse2019-02-051-2/+2
|\ | | | | | | | | Author is Developer in sec. release MR template See merge request gitlab-org/gitlab-ce!24934
| * Author is Developer in sec. release MR templateMarin Jankovski2019-02-051-2/+2
| |
* | Merge branch 'diff-file-finder' into 'master'Filipa Lacerda2019-02-0522-304/+404
|\ \ | | | | | | | | | | | | | | | | | | Added fuzzy file finder to merge requests Closes #53304 See merge request gitlab-org/gitlab-ce!24434
| * | Added fuzzy file finder to merge requestsPhil Hughes2019-02-0522-304/+404
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* | | Merge branch 'jlenny-DocPagesTemplates' into 'master'Marcia Ramos2019-02-052-4/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Instructions on how to use Pages templates Closes #56991 See merge request gitlab-org/gitlab-ce!24796
| * | | Instructions on how to use Pages templatesJason Lenny2019-02-052-4/+18
|/ / /
* | | Merge branch 'bvl-codeowner-rules-model-ce' into 'master'Sean McGivern2019-02-053-27/+25
|\ \ \ | | | | | | | | | | | | | | | | Adds helper for `find_or_create_by` in transaction See merge request gitlab-org/gitlab-ce!24913
| * | | Adds helper for `find_or_create_by` in transactionBob Van Landuyt2019-02-053-27/+25
| | | | | | | | | | | | | | | | This allows us to call `find_or_create_by` on all models and scopes.
* | | | Merge branch 'speedup-gitlab-assets-compile' into 'master'Sean McGivern2019-02-059-16/+72
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Cache assets in gitlab:assets:compile Closes #56691 See merge request gitlab-org/gitlab-ce!24542
| * | | Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobsRémy Coutable2019-02-057-16/+47
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Monkey-patch Sprockets to prevent cache ballooningRémy Coutable2019-02-052-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-encode-content-disposition' into 'master'Sean McGivern2019-02-0513-24/+129
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode Content-Disposition filenames Closes #47673 See merge request gitlab-org/gitlab-ce!24919
| * | | | Add Rails 6 deprecation error messageStan Hu2019-02-051-0/+7
| | | | |
| * | | | Encode Content-Disposition filenamesStan Hu2019-02-0413-24/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users downloading non-ASCII attachments would see garbled characters. When used with object storage, AWS S3 would return an InvalidArgument error: Header value cannot be represented using ISO-8859-1. Per RFC 5987 and RFC 6266, Content-Disposition should be encoded properly. This commit takes the Rails 6 implementation of ActiveSuppport::Http::ContentDisposition (https://github.com/rails/rails/pull/33829) and ports it here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47673
* | | | | Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-0558-699/+148
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Redcarpet markdown engine Closes #51374 See merge request gitlab-org/gitlab-ce!24819
| * | | | | Remove Redcarpet markdown engineJan Provaznik2019-02-0458-699/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* | | | | | Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master'Grzegorz Bizon2019-02-054-2/+30
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Don't create new pipeline for merge requests with no commits See merge request gitlab-org/gitlab-ce!24503
| * | | | | Fix false-positive specHiroyuki Sato2019-02-051-18/+18
| | | | | |
| * | | | | Move validation logic to service layerHiroyuki Sato2019-01-287-30/+26
| | | | | |
| * | | | | Make presence_of_commits_in_merge_request private methodHiroyuki Sato2019-01-251-6/+6
| | | | | |
| * | | | | Don't create merge request pipeline without commitsHiroyuki Sato2019-01-206-6/+38
| | | | | |
* | | | | | Merge branch 'fix_jira_integration_VCS1019' into 'master'Sean McGivern2019-02-053-1/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comparing equality between `ActionController::Parameters` and a `Hash`.... Closes #57221 See merge request gitlab-org/gitlab-ce!24896
| * | | | | Fix comparing equality between `ActionController::Parameters` and a `Hash`....Daniel Juarez2019-02-053-1/+16
|/ / / / /
* | | | | Merge branch 'pl-serialize-ac-parameters' into 'master'Sean McGivern2019-02-053-6/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make `ActionContorller::Parameters` serializable for sidekiq jobs See merge request gitlab-org/gitlab-ce!24864
| * | | | | Make `ActionContorller::Parameters` serializable for sidekiq jobsPeter Leitzen2019-02-053-6/+79
|/ / / / /
* | | | | Merge branch 'fe-grammar-util' into 'master'Phil Hughes2019-02-053-0/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | FE grammar util See merge request gitlab-org/gitlab-ce!24893
| * | | | | Add grammar utilPaul Slaughter2019-02-043-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains the function `toNounSeriesText` which can be used to build i18n noun series fragments (i.e. "A, B, and C").
* | | | | | Merge branch 'search-title' into 'master'Sean McGivern2019-02-0513-5/+132
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API See merge request gitlab-org/gitlab-ce!24350
| * | | | | | Fix grammar and spellingHiroyuki Sato2019-02-058-15/+15
| | | | | | |
| * | | | | | Add 'in' filter that modifies scope of 'search' filter to issues and merge ↵Hiroyuki Sato2019-01-1413-5/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | requests API
* | | | | | | Merge branch 'refactor/56370-extract-reply-placeholder-component' into 'master'Phil Hughes2019-02-056-25/+79
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract ReplyPlaceholder from NoteableDiscussion component Closes #56370 See merge request gitlab-org/gitlab-ce!24904
| * | | | | | | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-056-25/+79
|/ / / / / / /
* | | | | | | Merge branch 'adriel-add-deployment-data' into 'master'Phil Hughes2019-02-052-0/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add deployment data to metrics graphs See merge request gitlab-org/gitlab-ce!24650
| * | | | | | | Add deployment dataAdriel Santiago2019-02-042-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds scatter type series to metrics graph for deployments
* | | | | | | | Merge branch 'tz-update-register-element-for-emojis' into 'master'Phil Hughes2019-02-053-14/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated document-register-element and registering emojis in the new way See merge request gitlab-org/gitlab-ce!24899
| * | | | | | | | Updated document-register-element and registering emojis in the new wayTim Zallmann2019-02-053-14/+17
|/ / / / / / / /
* | | | | | | | Merge branch 'update-pages-config-only-when-changed' into 'master'Grzegorz Bizon2019-02-053-14/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pages config only when changed See merge request gitlab-org/gitlab-ce!24424
| * | | | | | | | Do not reload daemon if configuration file of pages does not changeKamil Trzciński2019-01-163-22/+48
| | | | | | | | |
| * | | | | | | | Update pages config only when changedKamil Trzciński2019-01-161-3/+20
| | | | | | | | |
* | | | | | | | | Merge branch '57227-absolute-uri-missing-hierarchical-segment' into 'master'Sean McGivern2019-02-053-1/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActionView::Template::Error: Absolute URI missing hierarchical segment Closes #57227 See merge request gitlab-org/gitlab-ce!24908
| * | | | | | | | | Catch possible Addressable::URI::InvalidURIErrorBrett Walker2019-02-043-1/+17
| | | | | | | | | |
* | | | | | | | | | Merge branch 'update-pages-extensionless-urls' into 'master'Evan Read2019-02-043-1/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for extensionless pages URLs See merge request gitlab-org/gitlab-ce!24876
| * | | | | | | | | Add support for extensionless pages URLsNick Thomas2019-02-043-1/+57
| | | | | | | | | |
* | | | | | | | | | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Annabel Dunstone Gray2019-02-042-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^2.0.2 See merge request gitlab-org/gitlab-ce!24915
| * | | | | | | | | Update dependency @gitlab/ui to ^2.0.2Lukas 'Eipi' Eipert2019-02-042-5/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ssh-host-key-indifferent' into 'master'Stan Hu2019-02-042-0/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SshHostKey.find_by to accept string keys See merge request gitlab-org/gitlab-ce!24903
| * | | | | | | | | Allow SshHostKey.find_by to accept string keysNick Thomas2019-02-042-0/+24
| | | | | | | | | |
* | | | | | | | | | Merge branch 'adriel-handle-echarts-resize-events' into 'master'Phil Hughes2019-02-045-30/+86
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle metrics graph resize events See merge request gitlab-org/gitlab-ce!24649