summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0616-145/+425
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-061-2/+19
| |\ | | | | | | | | | | | | | | | | | | Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902
| | * Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-061-2/+19
| | |
| * | Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-0622-214/+575
| |\ \ | | |/ | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| | * Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
| | | * Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-061-1/+1
| | | |
| | * | Merge branch '14256-upload-destroy-removes-file' into 'master'Sean McGivern2018-02-061-0/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uploads should delete files when destroyed Closes #14256 See merge request gitlab-org/gitlab-ce!16799
| | | * | improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-061-0/+12
| | | | |
| | * | | Merge branch 'feature/sm/artifacts-trace' into 'master'Kamil Trzciński2018-02-062-4/+7
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | CE: Trace as artifacts (FileStorage only) Closes gitlab-ee#4180 See merge request gitlab-org/gitlab-ce!16702
| | | * | Refactor :trace to :trace_live in specShinya Maeda2018-02-061-4/+4
| | | | |
| | | * | Finish all testsShinya Maeda2018-02-061-2/+2
| | | | |
| | | * | Add essential testsShinya Maeda2018-02-061-0/+3
| | | |/
| | * | Merge branch '26468-fix-admin-recent-sign-in' into 'master'Rémy Coutable2018-02-061-8/+14
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Using correct column for sorting users by Recent Sign-in Closes #26468 See merge request gitlab-org/gitlab-ce!13852
| | | * Using correct column for sorting users by Recent Sign-inPoornima2018-02-051-8/+14
| | | | | | | | | | | | | | | | Removing last_sign_in_at in specs
| | * | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-063-31/+57
| | | |
| | * | Merge branch '32282-add-foreign-keys-to-todos' into 'master'Yorick Peterse2018-02-053-2/+3
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Add missing foreign key and NOT NULL constraints to todos table. Closes #32282 See merge request gitlab-org/gitlab-ce!16849
| | | * Set todos#author_id to NOT NULL.32282-add-foreign-keys-to-todosAndreas Brandl2018-02-051-0/+1
| | | |
| | | * Add foreign keys to todos table.Andreas Brandl2018-02-052-2/+2
| | | | | | | | | | | | | | | | Fixes #32282.
| | * | Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-4/+116
| | | |
| | * | Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'Robert Speicher2018-02-051-1/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | Encode GitalyClient::WikiPage attributes to UTF-8 See merge request gitlab-org/gitlab-ce!16925
| | | * | Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issuesAhmad Sherif2018-02-051-1/+12
| | | | |
| | * | | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-0/+6
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
| | | * | add the uploader context to the upload modelMicaël Bergeron2018-02-021-0/+6
| | | | |
| | * | | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-051-0/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add backend for persistently dismissible callouts See merge request gitlab-org/gitlab-ce!16735
| | | * | | Change UserCallout feautre_name to enumMatija Čupić2018-02-031-1/+1
| | | | | |
| | | * | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0213-123/+158
| | | |\ \ \
| | | * | | | Rename Callout to UserCalloutMatija Čupić2018-02-021-2/+2
| | | | | | |
| | | * | | | Remove dismissed_state from Callout modelMatija Čupić2018-02-021-1/+8
| | | | | | |
| | | * | | | Add Callout specsMatija Čupić2018-01-261-0/+9
| | | | | | |
| | * | | | | Fix export removal for hashed-storage projects within a renamed or deleted ↵Nick Thomas2018-02-052-0/+51
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | namespace
| | * | | | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-041-11/+34
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client changes for Tag,BranchNamesContainingCommit See merge request gitlab-org/gitlab-ce!16789
| | | * | | | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-011-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of gitlab-org/gitaly#884, this commit contains the client implementation for both TagNamesContaintingCommit and BranchNamesContainingCommit. The interface in the Repository model stays the same, but the implementation on the serverside, e.g. Gitaly, uses `for-each-ref`, as opposed to `branch` or `tag` which both aren't plumbing command. The result stays the same. On the serverside, we have the opportunity to limit the number of names to return. However, this is not supported on the front end yet. My proposal to use this ability: gitlab-org/gitlab-ce#42581. For now, this ability is not used as that would change more behaviours on a feature flag which might lead to unexpected changes on page refresh for example.
| | * | | | | Merge branch ↵Grzegorz Bizon2018-02-031-8/+8
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/remove-duplicated-logic-between-model-and-lib-in-find-branch' into 'master' Remove repo reloading logic from Repository#find_branch Closes #42609 See merge request gitlab-org/gitlab-ce!16815
| | | * | | | Remove repo reloading logic from Repository#find_branchfix/remove-duplicated-logic-between-model-and-lib-in-find-branchAhmad Sherif2018-02-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#find_branch has a similar logic. Fixes #42609
| | * | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵Douwe Maan2018-02-021-7/+44
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!16821
| | | * | | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-011-7/+44
| | | | | | | |
| | * | | | | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-024-14/+2
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | including/extending it
| | * | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-012-60/+15
| | | |_|/ / | | |/| | |
| | * | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-011-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752
| | | * | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-2/+2
| | | |/ /
| * | | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-221-8/+24
| | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#639
* | | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| | | | |
* | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-315-10/+55
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * | | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-5/+3
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770
| | * | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-5/+3
| | | | |
| * | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-5/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate fetching wiki page formatted content to Gitaly Closes gitaly#958 See merge request gitlab-org/gitlab-ce!16716
| | * | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-5/+15
| | | |_|/ | | |/| | | | | | | | | | | | Closes gitaly#958
| * | | | Merge branch ↵Douwe Maan2018-01-301-0/+10
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
| | * | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that some legacy diff notes on GitLab.com have invalid line codes, which means truncated_diff_lines won't work. This is just a band-aid solution, as neither the diff nor the discussion will display correctly for these notes, but they won't cause a 500 error.
| * | | | Merge branch 'osw-short-circuit-mergeable-disccusions-state' into 'master'Sean McGivern2018-01-301-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Check MR state before submitting queries for discussion state Closes #42236 See merge request gitlab-org/gitlab-ce!16788
View Lorry Controller Status