Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
AgeCommit message (Collapse)Author
2018-01-08Merge branch 'sh-fix-issue-41735' into 'master'Marin Jankovski
Fix error 500 when viewing commit and merge request diffs Closes #41735 See merge request gitlab-org/gitlab-ce!16272
2018-01-05API: get participants from merge_requests & issuesBrent Greeff
2018-01-05Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda
Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
2018-01-05Merge branch 'remove-project-repo' into 'master'Sean McGivern
Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
2018-01-05Merge branch 'api-domains-expose-project_id' into 'master'Dmitriy Zaporozhets
Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200
2018-01-05Merge branch 'backport-issue_3413' into 'master'Sean McGivern
[EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
2018-01-05Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master'Tim Zallmann
Backport of methods and components added in EE See merge request gitlab-org/gitlab-ce!16208
2018-01-05Merge branch 'jivl-fix-import-project-url-bug' into 'master'Tim Zallmann
Fix import project url not updating project name Closes #40607 See merge request gitlab-org/gitlab-ce!16120
2018-01-05Merge branch 'winh-modal-target-id' into 'master'Filipa Lacerda
Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
2018-01-05Merge branch 'refactor-cluster-show-page-conservative' into 'master'Filipa Lacerda
Refactor cluster show page Closes #41335 See merge request gitlab-org/gitlab-ce!16089
2018-01-05Add id to modal.vue to support data-toggle="modal"Winnie Hellmann
2018-01-05Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)
2018-01-05Fix specsJacob Vosmaer
2018-01-05Merge branch '40228-verify-integrity-of-repositories' into 'master'Sean McGivern
Resolve "Verify integrity of repositories" Closes #40228 See merge request gitlab-org/gitlab-ce!15931
2018-01-05Merge branch 'zj-blob-batch' into 'master'Douwe Maan
Reroute batch blobs to single blob RPC See merge request gitlab-org/gitlab-ce!16082
2018-01-05Merge branch 'ldap_username_attributes' into 'master'Douwe Maan
Modify `LDAP::Person` to return username value based on attributes Closes #39691 See merge request gitlab-org/gitlab-ce!15286
2018-01-05Backport 'Rebase' feature from EE to CEJan Provaznik
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
2018-01-05Merge branch ↵Stan Hu
'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
2018-01-05Modify `LDAP::Person` to return username value based on attributesDrew Blessing
`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.
2018-01-05Create Kubernetes based on Application TemplatesMayra Cabrera
2018-01-05Fix a bug where charlock_holmes was used needlessly to encode stringsAlejandro Rodríguez
2018-01-04EE-BACKPORT group boardsFelipe Artur
2018-01-04Added multi editor setting on the profile preferences pageJose Ivan Vargas
2018-01-04Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-01-04Merge branch 'conditionally-eager-load-event-target-authors' into 'master'Douwe Maan
Eager load event target authors whenever possible Closes #41618 See merge request gitlab-org/gitlab-ce!16199
2018-01-04Merge branch ↵Douwe Maan
'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
2018-01-04Merge branch '3377-use-artifacts-tests-from-ee' into 'master'Rémy Coutable
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
2018-01-04Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets
[CE] Move git operations for UpdateRemoteMirrorService into Gitlab::Git See merge request gitlab-org/gitlab-ce!16023
2018-01-04Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan
Prevent excessive DB load due to faulty DeleteConflictingRedirectRoutes background migration See merge request gitlab-org/gitlab-ce!16205
2018-01-04Fix error when viewing diffs without blobsSean McGivern
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.
2018-01-04Merge branch '40533-groups-tree-updates' into 'master'Filipa Lacerda
Groups tree enhancements Closes #40533 See merge request gitlab-org/gitlab-ce!15980
2018-01-04Eager load event target authors whenever possibleYorick Peterse
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.
2018-01-04Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse
Avoid leaving a push event empty if payload cannot be created See merge request gitlab-org/gitlab-ce!16214
2018-01-04Merge branch 'gitaly-merge-nil' into 'master'Sean McGivern
Handle Gitaly aborted merge due to branch update Closes gitaly#854 See merge request gitlab-org/gitlab-ce!16116
2018-01-04Merge branch 'feature/add-max-count-to-count-commits-rpc' into 'master'Rémy Coutable
Add support for max_count option to Git::Repository#count_commits See merge request gitlab-org/gitlab-ce!16145
2018-01-04refactor spec, add docsJames Lopez
2018-01-04add lock specsJames Lopez
2018-01-04add locks chekJames Lopez
2018-01-04fix specJames Lopez
2018-01-04add new git fsck rake task and specJames Lopez
2018-01-04Merge branch 'change-issues-closed-at-background-migration' into 'master'Sean McGivern
Use a background migration for migrating issues.closed_at See merge request gitlab-org/gitlab-ce!16083
2018-01-04Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern
Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
2018-01-04Merge branch '41054-disable-creation-of-new-kubernetes-integrations' into ↵Kamil Trzciński
'master' 41054-Disallow creation of new Kubernetes integrations Closes #41054 See merge request gitlab-org/gitlab-ce!16017
2018-01-0441054-Disallow creation of new Kubernetes integrationsMayra Cabrera
2018-01-04Resolve "Resizable file list and commit panel"Tim Zallmann
2018-01-04Merge branch 'use-heredoc-for-keys' into 'master'Grzegorz Bizon
Use heredoc for long strings so it's easier to read See merge request gitlab-org/gitlab-ce!16179
2018-01-04Merge branch ↵Grzegorz Bizon
'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
2018-01-04Avoid leaving a push event empty if payload cannot be createdStan Hu
If the payload cannot be created for some reason, we could be left with a nil push event payload, which causes Error 500s when viewing the dashboard. Guard against this error and log when it happens. Avoids problems seen in #38823
2018-01-04Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez
2018-01-04Move push_remote_branches from Gitlab::Shell to Gitlab::Git::RepositoryAlejandro Rodríguez