summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Update to jQuery 3.Jacob Schatz2018-02-2011-34/+51
|
* Add unit tests for Gitaly typeszj-unit-test-gitaly-arraysZeger-Jan van de Weg2018-02-202-0/+5
|
* Merge branch 'move-spintach-project-network-graph-to-rspec' into 'master'Rémy Coutable2018-02-201-0/+108
|\ | | | | | | | | Move spinach project network graph tests to RSpec See merge request gitlab-org/gitlab-ce!17171
| * Move spinach project network graph tests to RSpecSemyon Pupkov2018-02-161-0/+108
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | Merge branch 'remove-chart-show-bundle' into 'master'Phil Hughes2018-02-203-4/+4
|\ \ | | | | | | | | | | | | Remove graphs_show.js webpack bundle See merge request gitlab-org/gitlab-ce!17194
| * | fix broken specsremove-chart-show-bundleMike Greiling2018-02-193-4/+4
| | |
* | | Remove extraneous tests from Issues API specrs-over-testingRobert Speicher2018-02-192-50/+2
|/ / | | | | | | | | | | | | | | These were all testing an implementation detail of `Issues::UpdateService` which is already well-tested and doesn't need to be re-tested here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25201
* | [GH Import] Create an empty wiki if wiki import failedValery Sizov2018-02-191-2/+6
| |
* | Resolve "group request membership mail with too long list of "To:""🙈 jacopo beschi 🙉2018-02-192-68/+91
| |
* | Merge branch 'jej/avoid-slow-file-lock-checks' into 'master'Sean McGivern2018-02-191-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Avoid slow File Lock checks when not used Closes #43339 See merge request gitlab-org/gitlab-ce!17140
| * | Avoid slow File Lock checks when not usedJames Edwards-Jones2018-02-191-2/+2
| | | | | | | | | | | | | | | Also avoid double commit lookup during file lock check by reusing memoized commits.
* | | Merge branch '32564-fix-double-system-closing-notes' into 'master'Sean McGivern2018-02-191-13/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Double closing system notes when closing issue with Merge Request" Closes #32546 and #32564 See merge request gitlab-org/gitlab-ce!17035
| * | | applying feedback32564-fix-double-system-closing-notesMicaël Bergeron2018-02-161-1/+1
| | | | | | | | | | | | | | | | # modified: lib/gitlab/git/commit.rb
| * | | fix specsMicaël Bergeron2018-02-161-13/+10
| | | |
| * | | stop ProcessCommitWorker from processing MR merge commitMicaël Bergeron2018-02-161-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'sh-fix-squash-rebase-utf8-data' into 'master'Sean McGivern2018-02-191-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix squash rebase not working when diff contained encoded data Closes gitlab-ee#4960 See merge request gitlab-org/gitlab-ce!17205
| * | | | | Fix squash rebase not working when diff contained encoded datash-fix-squash-rebase-utf8-dataStan Hu2018-02-181-0/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'sh-fix-geo-error-500-gpg-commit' into 'master'Douwe Maan2018-02-191-1/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+25
| |/ / / / | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-ee#4825
* | | | | Merge branch '41949-move' into 'master'Douwe Maan2018-02-191-0/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remember assignee when moving an issue See merge request gitlab-org/gitlab-ce!17116
| * | | | | Remember assignee when moving an issue41949-moveJan Provaznik2018-02-181-0/+22
| |/ / / / | | | | | | | | | | | | | | | Related to #41949
* | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-193-33/+180
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-44/+115
| | | | |
| * | | | Revert "Merge branch ↵Rubén Dávila2018-02-153-7/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" This reverts commit e607fd796657afd214b8f25201919d3e33b3f35f.
* | | | | Allow oxford commas and spaces before commas in MR issue closing pattern.Vicky Chijwani2018-02-171-0/+14
| | | | |
* | | | | 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.
* | | | Fix project import API after import service refactorJames Lopez2018-02-161-2/+2
| | | |
* | | | Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'Sean McGivern2018-02-161-0/+102
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API endpoint for importing a project export" Closes #41899 See merge request gitlab-org/gitlab-ce!17025
| * | | | refactor code based on feedbackJames Lopez2018-02-141-2/+2
| | | | |
| * | | | refactor code based on feedbackJames Lopez2018-02-141-8/+20
| | | | |
| * | | | add more specsJames Lopez2018-02-131-0/+9
| | | | |
| * | | | add more specsJames Lopez2018-02-131-1/+32
| | | | |
| * | | | add import status endpointJames Lopez2018-02-131-2/+2
| | | | |
| * | | | fix file uploadJames Lopez2018-02-131-2/+2
| | | | |
| * | | | update import API and specJames Lopez2018-02-131-3/+5
| | | | |
| * | | | update import API and specJames Lopez2018-02-131-3/+2
| | | | |
| * | | | add entity and update specJames Lopez2018-02-131-2/+2
| | | | |
| * | | | add more specsJames Lopez2018-02-131-5/+29
| | | | |
| * | | | add project import specJames Lopez2018-02-131-0/+25
| | | | |
* | | | | Merge branch 'asciidoc_inter_document_cross_references' into 'master'Sean McGivern2018-02-161-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Set Asciidoctor outfilesuffix to default .adoc Closes #43192 and #17602 See merge request gitlab-org/gitlab-ce!17125
| * | | | Set Asciidoctor outfilesuffix to default .adocTuro Soisenniemi2018-02-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without setting outfilesuffix Asciidoctor defaults to .html. When .html is used, inter-document cross references do not work in Gitlab's repository / file renderer. See more information from http://asciidoctor.org/docs/user-manual/#navigating-between-source-files and http://asciidoctor.org/docs/user-manual/#inter-document-cross-references
* | | | | Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master'Sean McGivern2018-02-161-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation about how to provide a user to Gitlab::Profiler See merge request gitlab-org/gitlab-ce!17169
| * | | | | Improve error handling for Gitlab::Profiler and improve doc about providing ↵update-profiler-docs-explaining-how-to-provide-userDylan Griffith2018-02-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | a user
* | | | | | Merge branch 'dm-escape-commit-message' into 'master'Sean McGivern2018-02-162-7/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape HTML entities in commit messages Closes #42833 See merge request gitlab-org/gitlab-ce!17144
| * | | | | Fix specdm-escape-commit-messageDouwe Maan2018-02-151-1/+1
| | | | | |
| * | | | | Escape HTML entities in commit messagesDouwe Maan2018-02-152-7/+6
| | | | | |
* | | | | | Merge branch '42929-hide-new-variable-values' into 'master'Clement Ho2018-02-152-15/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide CI secret variable values on save Closes #42929 See merge request gitlab-org/gitlab-ce!17044
| * | | | | | Hide CI secret variable values on save42929-hide-new-variable-valuesEric Eastwood2018-02-142-15/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/42928
View Lorry Controller Status