summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Set merge_request_diff_id on MR when creating37631-add-a-merge_request_diff_id-column-to-merge_requestsSean McGivern2017-11-023-2/+6
| | | | | | Once we migrate existing MRs to have this column, we will be able to get the latest diff for a single merge request more efficiently, and (more importantly) get all latest diffs for a collection of MRs efficiently.
* Add a column linking an MR to its diffSean McGivern2017-11-026-1/+118
| | | | | | We already had this the other way around (merge_request_diffs.merge_request_id), but this is needed to gather only the most recent diffs for a set of merge requests.
* Merge branch 'patch-29' into 'master'Stan Hu2017-10-311-1/+1
|\ | | | | | | | | Fix example typo. See merge request gitlab-org/gitlab-ce!15104
| * Fix example typo.Lawrence2017-10-311-1/+1
| |
* | Merge branch '38869-issue' into 'master'Phil Hughes2017-10-317-53/+40
|\ \ | | | | | | | | | | | | Remove issue and issue status select from global namespace See merge request gitlab-org/gitlab-ce!15090
| * | Enable eslintFilipa Lacerda2017-10-311-14/+11
| | |
| * | Fix broken test38869-issueFilipa Lacerda2017-10-301-1/+2
| | |
| * | Remove issue and issue status select from global namespaceFilipa Lacerda2017-10-306-51/+40
| | |
* | | Merge branch '3674-hashed-storage-attachments' into 'master'Douwe Maan2017-10-318-36/+162
|\ \ \ | | | | | | | | | | | | | | | | Hashed Storage support for Attachments See merge request gitlab-org/gitlab-ce!15068
| * | | Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-314-19/+14
| | | |
| * | | Code Style changes and `hashed_storage?` now receives optional featureGabriel Mazetto2017-10-314-26/+40
| | | |
| * | | ChangelogGabriel Mazetto2017-10-301-0/+5
| | | |
| * | | Document existing storable objects and their status regarding Hashed storageGabriel Mazetto2017-10-301-1/+24
| | | |
| * | | Use the Hashed Storage compatible layer to store AttachmentsGabriel Mazetto2017-10-302-14/+40
| | | |
| * | | Moved renaming operations to storage layer abstractionGabriel Mazetto2017-10-274-13/+76
| | | | | | | | | | | | | | | | | | | | When project storage_version is `2` means attachments are using hashed storage.
* | | | Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-312-8/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds callback function to initial cluster request Closes #39639 See merge request gitlab-org/gitlab-ce!15105
| * | | | Adds callback function to inital cluster request39639-clusters-pollFilipa Lacerda2017-10-312-8/+19
| | | | |
* | | | | Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' ↵Rémy Coutable2017-10-313-1/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix namespacing for MergeWhenPipelineSucceedsService in MR API Closes #39619 See merge request gitlab-org/gitlab-ce!15088
| * | | | | Fix namespacing for MergeWhenPipelineSucceedsService in MR APIMark Fletcher2017-10-303-1/+30
| | | | | |
* | | | | | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-3113-0/+221
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Add Packagist project service See merge request gitlab-org/gitlab-ce!14493
| * | | | | Add Packagist project serviceMatt Coleman2017-10-1313-0/+221
| | | | | |
* | | | | | Merge branch 'ph-multi-file-upload-file' into 'master'Filipa Lacerda2017-10-3113-22/+325
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upload files through the multi-file editor Closes #38629 and #38614 See merge request gitlab-org/gitlab-ce!14975
| * | | | | Upload files through the multi-file editorPhil Hughes2017-10-3113-22/+325
|/ / / / /
* | | | | Merge branch ↵Douwe Maan2017-10-313-6/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses' into 'master' Resolve "Emails on Push are sent to only the first recipient when using AWS SES" Closes #39593 See merge request gitlab-org/gitlab-ce!15083
| * | | | | Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-sesSean McGivern2017-10-303-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emails on push feature reuses the same email object, to avoid the expensive work of generating the email body. This interceptor would previously set multiple values for the same header, as that's the mail gem's default behaviour when called with the same header more than once. We don't want to change the emails on push service (although it's the only place where this happens), but fixing the interceptor is just as sensible anyway.
* | | | | | Merge branch ↵Phil Hughes2017-10-3110-257/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39616-convert-autosize-js-library-to-be-a-yarn-managed-library' into 'master' Resolve "Convert autosize.js library to be a Yarn managed library" Closes #39616 See merge request gitlab-org/gitlab-ce!15087
| * | | | | | Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-3110-257/+19
|/ / / / / /
* | | | | | Merge branch 'revert-2573818f' into 'master'Phil Hughes2017-10-3116-174/+93
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'" See merge request gitlab-org/gitlab-ce!15092
| * | | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-3016-174/+93
|/ / / / / | | | | | | | | | | This reverts merge request !15009
* | | | | Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-305-21/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Enable NestingDepth (level 6) on scss-lint Closes #39582 See merge request gitlab-org/gitlab-ce!15073
| * | | | Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-305-21/+12
| | | | |
* | | | | Merge branch '39583-reopen-issue-count-cache' into 'master'Rémy Coutable2017-10-303-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh open Issue and Merge Request project counter caches when re-opening Closes #39583 See merge request gitlab-org/gitlab-ce!15085
| * | | | | Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-303-0/+7
|/ / / / /
* | | | | Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'Rémy Coutable2017-10-306-10/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Members link when relative URL root paths are used See merge request gitlab-org/gitlab-ce!15070
| * | | | | Fix broken Members link when relative URL root paths are usedsh-fix-broken-redirection-relative-url-rootStan Hu2017-10-276-10/+15
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
* | | | | Merge branch ↵Sean McGivern2017-10-306-2/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39570-performance-bar-appears-enabled-even-though-it-won-t-show-up' into 'master' Resolve "Performance bar appears enabled even though it won't show up" Closes #39570 See merge request gitlab-org/gitlab-ce!15084
| * | | | | Add .gitlab/route-map.ymlRémy Coutable2017-10-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Allow to disable the Performance Bar and document the `p b` shortcut in its ↵Rémy Coutable2017-10-305-2/+36
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | doc page Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '38869-importer_status' into 'master'Phil Hughes2017-10-3013-476/+305
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove code from global namespace See merge request gitlab-org/gitlab-ce!15058
| * | | | | Fix queried element38869-importer_statusFilipa Lacerda2017-10-301-3/+3
| | | | | |
| * | | | | Merge branch 'master' into 38869-importer_statusFilipa Lacerda2017-10-30144-583/+2125
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Move locked check to a guard-clause Ci::Build tag is a trait instead of an own factory [CE backport] Saved configuration for issue board Use the correct project visibility in system hooks Add changelog more readable changelog Make merge_jid handling less stateful in MergeService Fetch the merged branches at once remove extra whitespace use a delegate for `username` to be more future friendly Merging EE doc into CE add changelog entry Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername ...
| * | | | | | Remove issuable form from global namespaceFilipa Lacerda2017-10-264-102/+98
| | | | | | |
| * | | | | | Remove issuableContext from global namespaceFilipa Lacerda2017-10-266-64/+60
| | | | | | |
| * | | | | | Improves issuable testsFilipa Lacerda2017-10-263-70/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes missing dependencies
| * | | | | | Remove old codeFilipa Lacerda2017-10-265-242/+112
| | | | | | |
* | | | | | | Merge branch 'update-fe-i18n-guide' into 'master'Filipa Lacerda2017-10-303-10/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update i18n in FE docs for marking and interpolation See merge request gitlab-org/gitlab-ce!15020
| * | | | | | | Update i18n in FE docs, marking, interpolationupdate-fe-i18n-guideEric Eastwood2017-10-243-10/+39
| | | | | | | |
* | | | | | | | Merge branch ↵Fatih Acet2017-10-303-5/+16
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone' into 'master' Fix call stack size exceeded group milestone description autocomplete Closes #39020 See merge request gitlab-org/gitlab-ce!14972
| * | | | | | | Split project and group milestone dispatcher branch39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestoneLuke "Jared" Bennett2017-10-241-0/+4
| | | | | | | |
| * | | | | | | Prefer dispatcher glform init over global initLuke "Jared" Bennett2017-10-231-0/+1
| | | | | | | |
View Lorry Controller Status