summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-issue-43631' into 'master'Stan Hu2018-02-272-4/+4
|\ | | | | | | | | | | | | Adjust the API issues move spec to use project ID 0 Closes #43631 See merge request gitlab-org/gitlab-ce!17381
| * Adjust the API issues move spec to use project ID 0Stan Hu2018-02-262-4/+4
| | | | | | | | Closes #43631
* | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ↵Mayra Cabrera2018-02-262-0/+44
|/ | | | -> edit Prometheus Service Template"
* Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-2692-99/+94
|
* Merge branch 'refactor/move-board-new-issue-vue-component' into 'master'Filipa Lacerda2018-02-261-1/+1
|\ | | | | | | | | Move BoardNewIssue vue component See merge request gitlab-org/gitlab-ce!16947
| * Move BoardNewIssue vue componentGeorge Tsiolis2018-02-081-1/+1
| |
* | Merge branch 'feature/migrate-recursive-tree-entries-fetching' into 'master'Robert Speicher2018-02-261-2/+2
|\ \ | | | | | | | | | | | | Migrate recursive tree entries fetching to Gitaly See merge request gitlab-org/gitlab-ce!17191
| * | Migrate recursive tree entries fetching to GitalyAhmad Sherif2018-02-261-2/+2
| | |
* | | Allow to find labels in ancestor groups and better group support in label ↵Jan Provaznik2018-02-262-23/+78
| | | | | | | | | | | | service
* | | Merge branch 'issue-edit-shortcut' into 'master'Filipa Lacerda2018-02-261-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue edit shortcut not working Closes #43560 See merge request gitlab-org/gitlab-ce!17360
| * | | Fixed issue edit shortcut not workingissue-edit-shortcutPhil Hughes2018-02-261-0/+12
| |/ / | | | | | | | | | | | | | | | | | | This was caused by the element getting cached on the class before the Vue app has finished rendering. Closes #43560
* | | Merge branch 'suppress-squash-warnings' into 'master'Douwe Maan2018-02-261-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Suppress whitespace warnings in squash error messages Closes gitlab-ee#3639 See merge request gitlab-org/gitlab-ce!17317
| * | | Suppress whitespace warnings in squash error messagessuppress-squash-warningsSean McGivern2018-02-261-0/+14
| | | | | | | | | | | | | | | | These are obscuring the real error, which is confusing for everyone.
* | | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan2018-02-261-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
| * | | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helperJames Lopez2018-02-231-1/+1
| | | |
| * | | refactor code based on feedbackJames Lopez2018-02-231-4/+4
| | | |
| * | | some initial refactoringJames Lopez2018-02-231-5/+5
| | | |
* | | | Merge branch 'dm-waitable-worker' into 'master'Sean McGivern2018-02-262-79/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extract WaitableWorker out of AuthorizedProjectsWorker See merge request gitlab-org/gitlab-ce!17356
| * | | | Extract WaitableWorker out of AuthorizedProjectsWorkerDouwe Maan2018-02-262-79/+92
| |/ / /
* | | | Merge branch 'get-rid-of-hardcoded-path-or-names-in-factories' into 'master'Nick Thomas2018-02-262-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Get rid of hard-coded user/project/group names that could clash with DB sequences See merge request gitlab-org/gitlab-ce!17290
| * | | | Get rid of hard-coded user/project/group names that could clash with DB ↵Rémy Coutable2018-02-262-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sequences Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'jprovazn-issuable-data' into 'master'Filipa Lacerda2018-02-261-16/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Don't convert issuable_initial_data into JSON See merge request gitlab-org/gitlab-ce!17318
| * | | | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-261-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
* | | | | Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'Douwe Maan2018-02-263-4/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Respond with more appropriate HTTP status code when repo does not exist See merge request gitlab-org/gitlab-ce!17341
| * | | | | Respond 404 when repo does not existmk/fix-error-code-for-repo-does-not-existMichael Kozono2018-02-243-4/+17
| |/ / / /
* | | | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-262-63/+88
|/ / / /
* | | | Merge branch 'minimal-fix-for-artifacts-service' into 'master'Grzegorz Bizon2018-02-241-13/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimal fix for artifacts service Closes #43022 See merge request gitlab-org/gitlab-ce!17313
| * | | | Bring back the initial commitShinya Maeda2018-02-241-12/+0
| | | | |
| * | | | Fixed static analysysShinya Maeda2018-02-241-5/+5
| | | | |
| * | | | Check if the latest permanent file exists before remove file. Add tests.Shinya Maeda2018-02-231-2/+18
| | | | |
| * | | | Copy original file to temp file always to prevent data lossShinya Maeda2018-02-231-13/+29
| |/ / /
* | | | Merge branch 'refactor/move-filtered-search-vue-component' into 'master'Clement Ho2018-02-242-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move RecentSearchesDropdownContent vue component See merge request gitlab-org/gitlab-ce!16951
| * | | | Move RecentSearchesDropdownContent vue componentGeorge Tsiolis2018-02-222-4/+3
| | | | |
* | | | | Merge branch ↵Stan Hu2018-02-231-2/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43570-localstorage-clear-error-when-feature-test-fails-before-visiting-page' into 'master' Resolve "localStorage.clear() error when Capybara test fails before visiting page" Closes #43570 See merge request gitlab-org/gitlab-ce!17339
| * | | | | prevent localStorage.clear from running when it would cause an errorMike Greiling2018-02-231-2/+4
| | | | | |
* | | | | | Merge branch ↵Stan Hu2018-02-231-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mk/fix-pg-undefined-table-untracked_files_for_uploads-does-not-exist' into 'master' Fix deletion attempts on dropped tables in specs Closes #42897 See merge request gitlab-org/gitlab-ce!17340
| * | | | | | Fix deletion attempts on dropped tablesMichael Kozono2018-02-231-2/+2
| |/ / / / /
* | | | | | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-23101-1014/+3880
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | # Conflicts: # config/webpack.config.js
| * | | | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-235-36/+38
| | | | | |
| * | | | | Merge branch '29497-pages-custom-domain-dns-verification' into 'master'Robert Speicher2018-02-2312-8/+694
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Domain validation for Pages custom domains" (master branch) Closes #29497, #42971, and #42083 See merge request gitlab-org/gitlab-ce!17311
| | * \ \ \ \ Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-237-36/+84
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | | | Add DNS verification to Pages custom domainsNick Thomas2018-02-2312-8/+694
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '42044-osw-add-button-to-deploy-runner-to-kubernetes' into 'master'Filipa Lacerda2018-02-232-2/+16
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a button to deploy a runner to a Kubernetes cluster in the settings page Closes #42044 See merge request gitlab-org/gitlab-ce!17278
| | * | | | | Add a button to deploy a runner to a Kubernetes cluster in the settings page42044-osw-add-button-to-deploy-runner-to-kubernetesOswaldo Ferreira2018-02-232-2/+16
| | | | | | |
| * | | | | | Merge branch 'dm-stuck-import-jobs-verify' into 'master'Sean McGivern2018-02-231-17/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify project import status again before marking as failed Closes #43539 See merge request gitlab-org/gitlab-ce!17319
| | * | | | | | Verify project import status again before marking as failedDouwe Maan2018-02-231-17/+31
| | | | | | | |
| | * | | | | | Adds scheduled import jobs to the stuck import jobs detection worker.Tiago Botelho2018-02-231-3/+13
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch ↵bjk/kube_state_metricsKamil Trzciński2018-02-231-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43496-error-message-for-gke-clusters-persists-in-the-next-page' into 'master' Resolve "Error message for GKE clusters persists in the next page" Closes #43496 See merge request gitlab-org/gitlab-ce!17299
| | * | | | | | Do not persist Google Project Billing Failure errors after a reloadMatija Čupić2018-02-221-1/+1
| | | | | | | |
| * | | | | | | Resolve "Milestone Quick Action not displayed with no project milestones but ↵🙈 jacopo beschi 🙉2018-02-233-14/+30
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | with group milestones"
View Lorry Controller Status