summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Remove blank flash messages caused by nil40671-fix-empty-blank-flash-messagesEric Eastwood2017-11-291-0/+22
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40671 See https://gitlab.com/gitlab-org/gitlab-ce/blob/f7254a4060b30e3134c6cf932eaba0fc8e249e9a/app/controllers/sessions_controller.rb#L42 for an example of where we set `flash[:notice] = nil`
* Merge branch 'bvl-double-fork' into 'master'Phil Hughes2017-11-291-1/+16
|\ | | | | | | | | Redirect to an already forked project if it exists See merge request gitlab-org/gitlab-ce!15653
| * Redirect to an already forked project if it existsBob Van Landuyt2017-11-291-1/+16
| | | | | | | | | | | | | | | | Before the we would try to `POST` to the project path, which would result in a 404, because that `POST` is not supported. By changing this back to a normal link, not not handled in JS, we can immeadiatly redirect.
* | support ordering of project notes in notes apihaseeb2017-11-291-0/+124
| |
* | Merge branch 'remove-mr-diff-serialised-columns' into 'master'Yorick Peterse2017-11-297-456/+402
|\ \ | | | | | | | | | | | | | | | | | | Remove serialised diff and commit columns Closes #39533 See merge request gitlab-org/gitlab-ce!15582
| * | Remove serialised diff and commit columnsSean McGivern2017-11-287-456/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The st_commits and st_diffs columns on merge_request_diffs historically held the YAML-serialised data for a merge request diff, in a variety of formats. Since 9.5, these have been migrated in the background to two new tables: merge_request_diff_commits and merge_request_diff_files. That has the advantage that we can actually query the data (for instance, to find out how many commits we've stored), and that it can't be in a variety of formats, but must match the new schema. This is the final step of that journey, where we drop those columns and remove all references to them. This is a breaking change to the importer, because we can no longer import diffs created in the old format, and we cannot guarantee the export will be in the new format unless it was generated after this commit.
* | | Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master'Sean McGivern2017-11-291-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Create fork networks for deleted source projects Closes #40072 See merge request gitlab-org/gitlab-ce!15595
| * | | Create fork networks for forks for which the source was deleted.Bob Van Landuyt2017-11-291-2/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we can join forks-of-forks into the same network even if their original source was deleted. Consider the following: `awesome-oss/badger` is forked to `coolstuff/badger`, which is forked to `user-a/badger` which in turn is forked to `user-b/badger`. When `awesome-oss/badger` is deleted, we will now create a fork network with `coolstuff/badger` as the root. The `user-a/badger` and `user-b/badger` projects will be added to the network.
* | | Merge branch 'multi-file-editor-css-fixes' into 'master'Tim Zallmann2017-11-2911-37/+212
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added IDE commit panel Closes #40041 See merge request gitlab-org/gitlab-ce!15583
| * | | fixed rspecmulti-file-editor-css-fixesPhil Hughes2017-11-244-4/+35
| | | | | | | | | | | | | | | | added getter specs
| * | | added specsPhil Hughes2017-11-247-33/+177
| | | | | | | | | | | | | | | | fixed scss-lint
* | | | Fix item name and namespace text overflow in Projects dropdownKushal Pandya2017-11-291-0/+12
| |/ / |/| |
* | | Merge branch ↵Sean McGivern2017-11-295-113/+275
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master' Resolve "Customize branch name when using create branch in an issue" Closes #21143 See merge request gitlab-org/gitlab-ce!13884
| * | | Add an ability to use a custom branch name on creation from issuesVitaliy @blackst0ne Klachkov2017-11-255-113/+275
| | | |
* | | | Merge branch 'remove-iife-autosize' into 'master'Fatih Acet2017-11-291-17/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve autosize spec See merge request gitlab-org/gitlab-ce!15620
| * | | | Remove iife and eslint disableremove-iife-autosizeClement Ho2017-11-271-17/+14
| | | | |
* | | | | Merge branch 'gitaly-ssh-upload-pack-opt-out' into 'master'Sean McGivern2017-11-291-6/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSHUploadPack over Gitaly is now OptOut Closes gitaly#730 See merge request gitlab-org/gitlab-ce!15623
| * | | | | SSHUploadPack over Gitaly is now OptOutgitaly-ssh-upload-pack-opt-outKim "BKC" Carlbäcker2017-11-291-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Better gitaly-handling in /api/internal/allowed specs
* | | | | | Merge branch 'backport-border-inline-edit' into 'master'Fatih Acet2017-11-291-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport - Add border for epic edit button See merge request gitlab-org/gitlab-ce!15637
| * | | | | | Backport border inline editbackport-border-inline-editClement Ho2017-11-281-4/+4
| | | | | | |
* | | | | | | Backport epic tasklistClement Ho2017-11-293-40/+65
| | | | | | |
* | | | | | | Add timeouts for Gitaly callsAndrew Newdigate2017-11-292-0/+75
| | | | | | |
* | | | | | | Merge branch 'dm-search-pattern' into 'master'Sean McGivern2017-11-294-13/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use fuzzy search with minimum length of 3 characters where appropriate Closes #40512 See merge request gitlab-org/gitlab-ce!15592
| * | | | | | | Use fuzzy search with minimum length of 3 characters where appropriatedm-search-patternDouwe Maan2017-11-273-6/+8
| | | | | | | |
| * | | | | | | Modify fuzzy_arel_match to search for equality when a term shorter than 3 ↵Douwe Maan2017-11-271-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters is provided
| * | | | | | | Rename to_fuzzy_arel to fuzzy_arel_matchDouwe Maan2017-11-241-6/+6
| | | | | | | |
* | | | | | | | Merge branch 'fix_invalid_new_pipeline_form' into 'master'Filipa Lacerda2017-11-291-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initializes the branches dropdown upon invalid entry Closes #40012 See merge request gitlab-org/gitlab-ce!15588
| * | | | | | | | initializes the branches dropdown upon invalid entryChristiaan Van den Poel2017-11-271-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Changelog added feature spec
* | | | | | | | | Merge branch ↵Kamil Trzciński2017-11-286-136/+430
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master' Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings Closes #38962 See merge request gitlab-org/gitlab-ce!15380
| * | | | | | | | Add checkboxes to automatically run AutoDevops pipelineEric Eastwood2017-11-282-9/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
| * | | | | | | | BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-284-127/+311
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
* | | | | | | | Merge branch ↵Rémy Coutable2017-11-283-6/+51
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master' Resolve "Merge request generates wrong diff when branch and tag have the same name" Closes #40530 See merge request gitlab-org/gitlab-ce!15591
| * | | | | | | Ensure MRs always use branch refs for comparisonSean McGivern2017-11-283-6/+51
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison.
* | | | | | | Merge branch 'hashed-storage-attachments-migration-path' into 'master'Nick Thomas2017-11-284-62/+195
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
| * | | | | | | Changes to Attachments Migration for EE and Geo compatibilityGabriel Mazetto2017-11-281-1/+1
| | | | | | | |
| * | | | | | | Backport EE changes to make test possible when prepending modulesGabriel Mazetto2017-11-241-6/+10
| | | | | | | |
| * | | | | | | fix exclusive lease specs fro hashed storage migrationGabriel Mazetto2017-11-231-3/+9
| | | | | | | |
| * | | | | | | Codestyle changes and Added Exclusive Lease to hashed storage migrationGabriel Mazetto2017-11-231-13/+31
| | | | | | | |
| * | | | | | | when rollingback repository migration, toggle readonly mode backGabriel Mazetto2017-11-231-3/+5
| | | | | | | |
| * | | | | | | Raises error when migration cannot happen so job is cancelledGabriel Mazetto2017-11-231-5/+2
| | | | | | | |
| * | | | | | | attachments migration should move only the base folderGabriel Mazetto2017-11-231-24/+18
| | | | | | | |
| * | | | | | | WIP Attachments migrationGabriel Mazetto2017-11-232-0/+112
| | | | | | | |
| * | | | | | | Refactor Hashed Storage migration to add additional migration stepsGabriel Mazetto2017-11-231-1/+1
| | | | | | | |
* | | | | | | | Merge branch '40561-environment-scope-value-is-not-trimmed' into 'master'Kamil Trzciński2017-11-281-0/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip leading & trailing whitespaces in CI/CD secret variable keys See merge request gitlab-org/gitlab-ce!15615
| * | | | | | | | Strip leading & trailing whitespaces in CI/CD secret variable keys40561-environment-scope-value-is-not-trimmedRémy Coutable2017-11-271-0/+18
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'tm/feature/list-runners-jobs-api' into 'master'Kamil Trzciński2017-11-282-0/+173
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new API endpoint - list jobs of a specified runner Closes #39699 See merge request gitlab-org/gitlab-ce!15432
| * | | | | | | | Refactorize jobs finding logicTomasz Maczukin2017-11-282-4/+43
| | | | | | | | |
| * | | | | | | | Use 'set' instead of 'let!' when it's possibleTomasz Maczukin2017-11-281-1/+1
| | | | | | | | |
| * | | | | | | | Allow filtering by 'status'Tomasz Maczukin2017-11-281-4/+46
| | | | | | | | |
| * | | | | | | | Add information about projectTomasz Maczukin2017-11-281-4/+4
| | | | | | | | |
View Lorry Controller Status