summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-052-1/+48
|
* Merge branch 'ce-backport=reorder-issues' into 'master'Sean McGivern2018-01-0510-54/+32
|\ | | | | | | | | CE Backport of reordering issues in epics See merge request gitlab-org/gitlab-ce!16247
| * Refactor matchers for background migrationsce-backport=reorder-issuesJarka Kadlecová2018-01-0510-54/+32
| |
* | API: get participants from merge_requests & issuesBrent Greeff2018-01-053-0/+47
| |
* | Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda2018-01-0511-7/+480
|\ \ | | | | | | | | | | | | | | | | | | Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
| * | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-0511-7/+480
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | Merge branch 'remove-project-repo' into 'master'Sean McGivern2018-01-055-11/+15
|\ \ | | | | | | | | | | | | Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
| * | Fix specsremove-project-repoJacob Vosmaer2018-01-055-11/+15
| | |
* | | Merge branch 'api-domains-expose-project_id' into 'master'Dmitriy Zaporozhets2018-01-052-1/+3
|\ \ \ | | | | | | | | | | | | | | | | Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
| * | | Expose project_id on /api/v4/pages/domainsLuc Didry2018-01-032-1/+3
| | | |
* | | | Merge branch 'backport-issue_3413' into 'master'Sean McGivern2018-01-056-168/+293
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
| * | | | EE-BACKPORT group boardsFelipe Artur2018-01-046-168/+293
| |/ / /
* | | | Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master'Tim Zallmann2018-01-052-0/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport of methods and components added in EE See merge request gitlab-org/gitlab-ce!16208
| * | | | Backport of methods and components added in EBackport of methods and ↵Filipa Lacerda2018-01-032-0/+42
| | | | | | | | | | | | | | | | | | | | components added in EEE
* | | | | Merge branch 'jivl-fix-import-project-url-bug' into 'master'Tim Zallmann2018-01-051-14/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import project url not updating project name Closes #40607 See merge request gitlab-org/gitlab-ce!16120
| * | | | | Fix import project url not updating project namejivl-fix-import-project-url-bugJose Ivan Vargas2018-01-031-14/+18
| | |/ / / | |/| | |
* | | | | Merge branch 'winh-modal-target-id' into 'master'Filipa Lacerda2018-01-054-23/+72
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
| * | | | | Add id to modal.vue to support data-toggle="modal"Winnie Hellmann2018-01-054-23/+72
| | | | | |
* | | | | | Merge branch 'refactor-cluster-show-page-conservative' into 'master'Filipa Lacerda2018-01-052-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cluster show page Closes #41335 See merge request gitlab-org/gitlab-ce!16089
| * | | | | | Match updated clusters/show in feature specsMatija Čupić2017-12-212-7/+7
| | | | | | |
* | | | | | | Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)2018-01-051-0/+7
| | | | | | |
* | | | | | | Merge branch '40228-verify-integrity-of-repositories' into 'master'Sean McGivern2018-01-051-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verify integrity of repositories" Closes #40228 See merge request gitlab-org/gitlab-ce!15931
| * | | | | | | refactor spec, add docsJames Lopez2018-01-041-8/+8
| | | | | | | |
| * | | | | | | add lock specsJames Lopez2018-01-041-0/+13
| | | | | | | |
| * | | | | | | add locks chekJames Lopez2018-01-041-1/+3
| | | | | | | |
| * | | | | | | fix specJames Lopez2018-01-041-9/+5
| | | | | | | |
| * | | | | | | add new git fsck rake task and specJames Lopez2018-01-041-0/+27
| | | | | | | |
* | | | | | | | Merge branch 'zj-blob-batch' into 'master'Douwe Maan2018-01-051-11/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reroute batch blobs to single blob RPC See merge request gitlab-org/gitlab-ce!16082
| * | | | | | | | Reroute batch blobs to single blob RPCZeger-Jan van de Weg2018-01-021-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the priorities shifted for the Gitaly team, this endpoint does not get a dedicated endpoint yet. To make it work in a cloud native environment the request needs to go to Gitaly, not rugged. This is achieved by rerouting to the generic TreeEntry endpoint.
* | | | | | | | | Merge branch 'ldap_username_attributes' into 'master'Douwe Maan2018-01-053-5/+98
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify `LDAP::Person` to return username value based on attributes Closes #39691 See merge request gitlab-org/gitlab-ce!15286
| * | | | | | | | Modify `LDAP::Person` to return username value based on attributesDrew Blessing2018-01-043-5/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Gitlab::LDAP::Person` did not respect the LDAP attributes username configuration and would simply return the uid value. There are cases where users would like to specify a different username field to allow more friendly GitLab usernames. For example, it's common in AD to have sAMAccountName be an employee ID like `A12345` while the local part of the email address is more human-friendly.
* | | | | | | | | Merge branch ↵Stan Hu2018-01-051-0/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handler' into 'master' Resolve "Branch name omitted due to bad UTF-8 conversion by Gitaly ref handler" Closes #41677 See merge request gitlab-org/gitlab-ce!16243
| * | | | | | | | | Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-041-0/+18
| | | | | | | | | |
* | | | | | | | | | Create Kubernetes based on Application TemplatesMayra Cabrera2018-01-044-20/+82
|/ / / / / / / / /
* | | | | | | | | Added multi editor setting on the profile preferences pageJose Ivan Vargas2018-01-043-1/+19
| | | | | | | | |
* | | | | | | | | Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets2018-01-041-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | User#projects_limit remove DB default and added NOT NULL constraintMario de la Ossa2017-12-301-0/+17
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is required because otherwise if a user is created with a value for `projects_limit` that matches the DB default, it gets overwritten by `current_application_settings.default_projects_limit`. By removing the default we once again can allow a user to be created with a limit of 10 projects without the risk that it'll change to 10000
* | | | | | | | | Merge branch 'conditionally-eager-load-event-target-authors' into 'master'Douwe Maan2018-01-042-0/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eager load event target authors whenever possible Closes #41618 See merge request gitlab-org/gitlab-ce!16199
| * | | | | | | | | Eager load event target authors whenever possibleconditionally-eager-load-event-target-authorsYorick Peterse2018-01-042-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the "author" association of an event's "target" association is eager loaded whenever the "target" association defines an "author" association. This in turn solves the N+1 query problem we first tried to solve in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788 but caused problems when displaying milestones as those don't define an "author" association. The approach in this commit does mean that the authors are _always_ eager loaded since this takes place in the "belongs_to" block. This however shouldn't pose too much of a problem, and as far as I can tell there's no real way around this unfortunately.
* | | | | | | | | | Merge branch ↵Douwe Maan2018-01-041-0/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master' Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass" Closes #41468 See merge request gitlab-org/gitlab-ce!16193
| * | | | | | | | | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-0/+25
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old merge requests can have diffs without corresponding blobs. (This also may be possible for commit diffs in corrupt repositories.) We can't use the `&.` operator on the blobs, because the blob objects are never nil, but `BatchLoader` instances that delegate to `Blob`. We can't use `Object#try`, because `Blob` doesn't inherit from `Object`. `BatchLoader` provides a `__sync` method that returns the delegated object, but using `itself` also works because it's forwarded, and will work for non-`BatchLoader` instances too. So the simplest solution is to just use that with the `&.` operator.
* | | | | | | | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable2018-01-041-13/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Unify CE and EE tests in spec/controllers/projects/artifacts_controller_spec.rb Closes gitlab-ee#3377 See merge request gitlab-org/gitlab-ce!16133
| * | | | | | | | | | Just use the tests from EE3377-use-artifacts-tests-from-eeLin Jen-Shin2017-12-261-13/+34
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-042-58/+107
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Move git operations for UpdateRemoteMirrorService into Gitlab::Git See merge request gitlab-org/gitlab-ce!16023
| * | | | | | | | | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-28/+69
| | | | | | | | | | | |
| * | | | | | | | | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez2018-01-032-30/+38
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-042-28/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration See merge request gitlab-org/gitlab-ce!16205
| * | | | | | | | | | | Make DeleteConflictingRedirectRoutes no-opmk-no-op-delete-conflicting-redirectsMichael Kozono2018-01-032-28/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both the post-deploy and background migration.
* | | | | | | | | | | | Merge branch '40533-groups-tree-updates' into 'master'Filipa Lacerda2018-01-046-63/+121
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Groups tree enhancements Closes #40533 See merge request gitlab-org/gitlab-ce!15980
| * | | | | | | | | | | | Update test to remove carent icon checkKushal Pandya2018-01-021-8/+0
| | | | | | | | | | | | |
View Lorry Controller Status