summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Lfs::FileModificationHandlermk/jej/commit-api-tracks-lfsMichael Kozono2018-02-213-22/+26
|
* Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-02-215-10/+183
| | | | | | | | Updates Files::MultiService for the commits API which is in turn used by the multi-file upload web UI Ensures that files which should be in LFS are transformed into LFS pointers Uses Lfs::FileModificationHandler which then links LfsObjectProjects on success
* Repository#attributes_at caches parser per refJames Edwards-Jones2018-02-211-2/+4
| | | Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref
* Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-195-25/+51
|\ | | | | | | | | | | | | Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
| * Convert Gitaly commit parent IDs to array as early as possibleSean McGivern2018-02-191-10/+1
| | | | | | | | | | The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
| * applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-163-5/+6
| | | | | | | | # modified: lib/gitlab/git/commit.rb
| * fix specsMicaël Bergeron2018-02-162-13/+18
| |
| * add changelogMicaël Bergeron2018-02-161-0/+5
| |
| * stop ProcessCommitWorker from processing MR merge commitMicaël Bergeron2018-02-163-17/+41
| | | | | | | | | | | | | | When a merge request is merged, it creates a commit with the description of the MR, which may contain references and issue closing references. As this will be handled in the PostMergeService anyways, let's ignore merge commit generated from a MR.
* | Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-193-0/+15
|\ \ | | | | | | | | | | | | | | | | | | Don't attempt to update user tracked fields if database is in read-only Closes gitlab-ee#4972 See merge request gitlab-org/gitlab-ce!17200
| * | Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-173-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | With Geo, attempting to view an endpoint with a user could result in an Error 500 since Devise attempts to update the last sign-in IP and other details. Closes gitlab-org/gitlab-ee#4972
* | | Merge branch 'docs-articles-layout-frontmatter' into 'master'Achilleas Pipinellis2018-02-1911-63/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update all articles with the new layout (metadata from the frontmatter) Closes #42831 See merge request gitlab-org/gitlab-ce!17187
| * | | Update all articles with the new layout (meta data from the frontmatter)docs-articles-layout-frontmatterMarcia Ramos2018-02-1611-63/+90
| | | | | | | | | | | | | | | | Context: https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/182
* | | | Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-193-0/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
| * | | | Clarify changelog for squash encoding fixSean McGivern2018-02-191-1/+1
| | | | | | | | | | | | | | | [ci skip]
| * | | | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-183-0/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the applied diff contains UTF-8 or some other encoded data, the diff returned back from the git process may be in ASCII-8BIT format. Writing this data to stdin may fail if the data because stdin expects this data to be in UTF-8. By switching the output to binmode, we ensure that the diff will always be written as-is. Closes gitlab-org/gitlab-ee#4960
* | | | Merge branch 'ee-webpack-backport' into 'master'Filipa Lacerda2018-02-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport webpack.config.js changes from EE See merge request gitlab-org/gitlab-ce!17185
| * | | | Backport webpack.config.js changes from EEee-webpack-backportPhil Hughes2018-02-161-2/+2
| | |/ / | |/| |
* | | | Merge branch 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-193-2/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when viewing a commit with a GPG signature in Geo Closes gitlab-ee#4825 See merge request gitlab-org/gitlab-ce!17207
| * | | | Fix Error 500 when viewing a commit with a GPG signature in GeoStan Hu2018-02-193-2/+33
| | |/ / | |/| | | | | | | | | | Closes gitlab-org/gitlab-ee#4825
* | | | Merge branch '41949-move' into 'master'Douwe Maan2018-02-193-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remember assignee when moving an issue See merge request gitlab-org/gitlab-ce!17116
| * | | | Remember assignee when moving an issue41949-moveJan Provaznik2018-02-183-1/+29
| |/ / / | | | | | | | | | | | | Related to #41949
* | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-198-43/+213
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!17138
| * | | Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-166-45/+119
| | | |
| * | | Revert "Merge branch ↵Rubén Dávila2018-02-156-17/+113
| | | | | | | | | | | | | | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* | | | Merge branch '17500-mr-multiple-issues-oxford-comma' into 'master'Stan Hu2018-02-183-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update issue closing pattern to be more forgiving Closes #17500 See merge request gitlab-org/gitlab-ce!17198
| * | | | Add changelog entryVicky Chijwani2018-02-171-0/+5
| | | | |
| * | | | Allow oxford commas and spaces before commas in MR issue closing pattern.Vicky Chijwani2018-02-172-1/+15
| | | | |
* | | | | Merge branch 'revert-215dff76' into 'master'Ian Baum2018-02-172-38/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'" See merge request gitlab-org/gitlab-ce!17193
| * | | | Add back database changes for Ci::Buildrevert-215dff76Stan Hu2018-02-163-2/+27
| | | | |
| * | | | Revert "Merge branch 'expired-ci-artifacts' into 'master'"Stan Hu2018-02-165-65/+6
| | | | | | | | | | | | | | | This reverts merge request !16578
* | | | | Merge branch 'dm-dont-cache-nil-root-ref' into 'master'Stan Hu2018-02-172-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't cache a nil repository root ref to prevent caching issues See merge request gitlab-org/gitlab-ce!17179
| * | | | | Don't cache a nil repository root ref to prevent caching issuesdm-dont-cache-nil-root-refDouwe Maan2018-02-162-6/+7
| |/ / / /
* | | | | Merge branch '43296-fix-specs-broken-by-hardcoding-paths' into 'master'Robert Speicher2018-02-164-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix order dependencies in some specs Closes #43296 See merge request gitlab-org/gitlab-ce!17189
| * | | | Fix order dependencies in some specsNick Thomas2018-02-164-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | Our automatically-generated project paths are of the form project<N>. If a spec manually specifies a project path of that form, it may conflict with the automatically-generated paths in some circumstances.
* | | | Merge branch 'fix-more-dispatcher-stuff' into 'master'Jacob Schatz2018-02-1631-206/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove more route-based chunks from dispatcher.js See merge request gitlab-org/gitlab-ce!16901
| * | | | migrate admin:users:* to static bundlefix-more-dispatcher-stuffMike Greiling2018-02-164-24/+4
| | | | |
| * | | | correct for missing break statement in dispatcher.jsMike Greiling2018-02-162-0/+1
| | | | |
| * | | | alias create and update actions to new and editMike Greiling2018-02-161-4/+11
| | | | |
| * | | | migrate projects:merge_requests:edit to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:merge_requests:creations:diffs to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:merge_requests:creations:new to static bundleMike Greiling2018-02-162-6/+2
| | | | |
| * | | | migrate projects:issues:new and projects:issues:edit to static bundleMike Greiling2018-02-163-16/+2
| | | | |
| * | | | migrate projects:branches:index to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate projects:branches:new to static bundleMike Greiling2018-02-162-11/+3
| | | | |
| * | | | migrate projects:compare:show to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate projects:environments:metrics to static bundleMike Greiling2018-02-162-6/+1
| | | | |
| * | | | migrate projects:milestones:* and groups:milestones:* to static bundleMike Greiling2018-02-165-28/+4
| | | | |
| * | | | migrate explore:groups:index to static bundleMike Greiling2018-02-162-7/+2
| | | | |
| * | | | migrate explore:projects:* to static bundleMike Greiling2018-02-162-8/+1
| | | | |
View Lorry Controller Status