summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Remember assignee when moving an issue41949-moveJan Provaznik2018-02-181-0/+22
| | | | Related to #41949
* 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
* | | | | Replace $.get with axios in importerStatusClement Ho2018-02-151-7/+67
| | | | |
* | | | | Merge branch 'winh-new-modal-component' into 'master'Filipa Lacerda2018-02-151-0/+192
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add new modal Vue component See merge request gitlab-org/gitlab-ce!17108
| * | | | | Add new modal Vue componentwinh-new-modal-componentWinnie Hellmann2018-02-141-0/+192
| | |_|/ / | |/| | |
* | | | | Re-enable eslint in `commits.js` fileAndré Luís2018-02-151-9/+11
| | | | |
* | | | | Remove internal api calls from the rack::attack throttlingFrancisco Javier López2018-02-151-0/+10
| | | | |
* | | | | Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'Rémy Coutable2018-02-151-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim whitespace from input in the username/email form field Closes #42637 See merge request gitlab-org/gitlab-ce!17020
| * | | | | Strip whitespace from username/login value for user lookupPeter Lauck2018-02-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the discussion with @psimyn, this change does not affect the frontend, so user input will not be validated on the signin screen. Instead, the value sent to the backend has leading and trailing whitespace stripped before looking up the user with find_by. Closes #42637
* | | | | | Merge branch 'pipeline-schedule-webpack' into 'master'Filipa Lacerda2018-02-152-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Converted pipeline_schedules bundles into automatic webpack entries See merge request gitlab-org/gitlab-ce!17143
| * | | | | | Converted pipeline_schedules bundles into automatic webpack entriespipeline-schedule-webpackPhil Hughes2018-02-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | #41341
* | | | | | | Merge branch 'sh-fix-error-500-licensee' into 'master'Douwe Maan2018-02-151-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500s loading repositories with inconsistent HEAD Closes #43268 See merge request gitlab-org/gitlab-ce!17128
| * | | | | | | Simplify license generator error handlingStan Hu2018-02-141-3/+2
| | | | | | | |
| * | | | | | | Fix Error 500s loading repositories with no master branchStan Hu2018-02-141-0/+13
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed the exception handling for Rugged errors in !16770, which revealed that the licensee gem attempts to retrieve a license file via Rugged in `refs/heads/master` by default. If that branch did not exist, a Rugged::ReferenceError would be thrown. There were two issues: 1. Not every project uses `master` as the default branch. This change uses the head commit to identify the license. 2. Removing the exception handling caused repositories to fail loading. We can safely catch and ignore any Rugged error because this means we weren't able to load a license file. Closes #43268
* | | | | | | Merge branch 'move-profile-to-rspec' into 'master'Rémy Coutable2018-02-155-19/+231
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move spinach profile tests to RSpec See merge request gitlab-org/gitlab-ce!17068
| * | | | | | | Move spinach profile tests to RSpecSemyon Pupkov2018-02-155-19/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | | Merge branch 'ce-rc/move-more-ee-only-spec-files' into 'master'Sean McGivern2018-02-152-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Port some changes from gitlab-ee!4532 back to CE See merge request gitlab-org/gitlab-ce!17120
| * | | | | | | Port some changes from gitlab-ee!4532 back to CEce-rc/move-more-ee-only-spec-filesRémy Coutable2018-02-142-4/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-153-0/+45
| | | | | | |
* | | | | | | Merge branch 'jej/fix-slow-lfs-object-check' into 'master'Douwe Maan2018-02-151-2/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check LFS integrity for first branch in push Closes #41141 See merge request gitlab-org/gitlab-ce!17098
| * | | | | | Only check LFS integrity for first branch in pushjej/fix-slow-lfs-object-checkJames Edwards-Jones2018-02-151-2/+17
| | | | | | |
* | | | | | | Move spinach group milestones test to RSpecSemyon Pupkov2018-02-151-37/+114
| | | | | | |
* | | | | | | Merge branch 'group-search-members-rspec' into 'master'Rémy Coutable2018-02-151-0/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move feature group members search test to RSpec See merge request gitlab-org/gitlab-ce!17050
| * | | | | | | Move feature group members search test to RSpecSemyon Pupkov2018-02-151-0/+29
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | Merge branch '35530-teleporting-emoji-fix' into 'master'Fatih Acet2018-02-151-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix teleporting emoji (MR description instead of comment) Closes #35530 See merge request gitlab-org/gitlab-ce!17100
| * | | | | | | The emoji menu should not close when the search box is clickedJared Deckard2018-02-071-1/+12
| | | | | | | |
* | | | | | | | Merge branch '34130-null-pipes' into 'master'Fatih Acet2018-02-151-0/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured" See merge request gitlab-org/gitlab-ce!17053