summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer2017-10-035-47/+51
|
* Merge branch 'fix-kubectl-180' into 'master'Kamil Trzciński2017-10-032-2/+2
|\ | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
| * Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180Alessio Caiazza2017-10-032-2/+2
| |
* | Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-10-032-30/+79
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Cannot rename a hashed project" Closes #38202 See merge request gitlab-org/gitlab-ce!14428
| * | Fix specs for project creation and update services38202-cannot-rename-a-hashed-projectDouglas Barbosa Alexandre2017-10-022-3/+3
| | |
| * | Doesn't check if path exists on disk when renaming a hashed projectDouglas Barbosa Alexandre2017-10-022-30/+79
| | |
* | | Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-031-0/+34
|\ \ \ | | | | | | | | | | | | | | | | Improve performance of filtering notes in NotesController See merge request gitlab-org/gitlab-ce!14645
| * | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-021-0/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | Reduces the number of queries needed to redact notes to which the user does not have access. Also includes an N+1 query test as a guard against future issues. This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14327#note_40976854.
* | | Merge branch 'close-issue-by-implements' into 'master'Sean McGivern2017-10-031-0/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add "implements" to the default issue closing message regex Closes #38424 See merge request gitlab-org/gitlab-ce!14612
| * | | Add "implements" to the default issue closing message regexGuilherme Vieira2017-10-021-0/+40
| | | |
* | | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-0312-71/+322
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-0242-220/+966
| |\ \ \ \
| * | | | | Add merge_requests_rebase_enabled to json entities for specsValery Sizov2017-10-022-1/+3
| | | | | |
| * | | | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-292-2/+10
| | | | | |
| * | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2841-178/+1327
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb
| * \ \ \ \ \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-26108-1015/+2033
| |\ \ \ \ \ \
| * | | | | | | Add test to check for project settings merge strategiesEric Eastwood2017-09-261-0/+18
| | | | | | | |
| * | | | | | | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-262-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104
| * | | | | | | Use new shared Vue mountComponent methodEric Eastwood2017-09-201-15/+5
| | | | | | | |
| * | | | | | | Fix entities/merge_request.json by adding ff_only_mergeValery Sizov2017-09-201-1/+2
| | | | | | | |
| * | | | | | | Add spec for Project#merge_methodValery Sizov2017-09-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be deleted from EE side when doing CE->EE merge!
| * | | | | | | Pulling merge_method spec for project_controller_spec from EE[ci skip]Valery Sizov2017-09-201-0/+18
| | | | | | | |
| * | | | | | | Fix ff_merge_requests.feature spinach testsEric Eastwood2017-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error was thrown before ``` source repository is empty /builds/gitlab-org/gitlab-ce/lib/gitlab/git/repository.rb:838:in `block in fetch_source_branch' ```
| * | | | | | | Port fast-forward widget_spec test from EEEric Eastwood2017-09-191-0/+22
| | | | | | | |
| * | | | | | | Port fast-forward MR widget states from EEEric Eastwood2017-09-192-63/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076
| * | | | | | | Add spec for Repository#ff_merge (ported from EE)Valery Sizov2017-09-192-1/+30
| | | | | | | |
| * | | | | | | Add spec for FfMergeServiceValery Sizov2017-09-191-0/+84
| | | | | | | |
| * | | | | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-191-0/+1
| | | | | | | |
* | | | | | | | Fix for Gitaly nil encoding issueAndrew Newdigate2017-10-032-1/+15
| | | | | | | |
* | | | | | | | Merge branch 'gitaly-get-archive' into 'master'Douwe Maan2017-10-031-1/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send extra Gitaly params for `send_git_archive` if needed See merge request gitlab-org/gitlab-ce!14605
| * | | | | | | | [ci skip] Fix archive spec descrptionsgitaly-get-archiveAlejandro Rodríguez2017-10-021-2/+2
| | | | | | | | |
| * | | | | | | | Send extra Gitaly params for `send_git_archive` if neededAlejandro Rodríguez2017-10-021-1/+39
| | | | | | | | |
* | | | | | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'Douwe Maan2017-10-031-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task Closes #38635 See merge request gitlab-org/gitlab-ce!14624
| * | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake taskNick Thomas2017-10-021-1/+6
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-022-0/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos task Closes #37682 See merge request gitlab-org/gitlab-ce!14597
| * | | | | | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-022-0/+20
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682
* | | | | | | | Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master'Robert Speicher2017-10-021-0/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Fix case sensitive email confirmation on signup See merge request gitlab-org/gitlab-ce!14606
| * | | | | | | Create failing test caserobdel122017-09-301-0/+18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/gpg/case-insensitive' into 'master'Dmitriy Zaporozhets2017-10-021-0/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Make GPG validation case insensitive See merge request gitlab-org/gitlab-ce!14376
| * | | | | | Make GPG validation case insensitive.Tim Bishop2017-09-291-0/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line with other changes in GitLab, make email address validation properly case insensitive. The email address in the commit may be in any case, so it needs downcasing to match the address stored in GitLab for the user. Without this change the comparison fails and commits are not marked as verified. See #37009.
* | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-022-18/+96
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to link saml users to ldap by email Closes #33493 See merge request gitlab-org/gitlab-ce!14216
| * | | | | | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-022-58/+59
| | | | | | |
| * | | | | | Attempt to link saml users to ldap by emailTiago Botelho2017-09-251-0/+77
| | | | | | |
* | | | | | | Merge branch 'revert-configurable-size-limits' into 'master'Douwe Maan2017-10-022-36/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" See merge request gitlab-org/gitlab-ce!14628
| * | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-022-36/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d3c33b57eeb39df76e78fd37c86532c02aa22ac.
* | | | | | | | Fix 'gitlay' typo in specJacob Vosmaer2017-10-021-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-027-53/+181
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPC Closes gitaly#544 See merge request gitlab-org/gitlab-ce!14522
| * | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-302-25/+105
| | | | | | |
| * | | | | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-302-1/+45
| | | | | | |
| * | | | | | Add a factory for `Gitaly::GitCommit`sAlejandro Rodríguez2017-09-303-27/+31
| | |/ / / / | |/| | | |
View Lorry Controller Status