summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-061-0/+12
|
* 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
| |/ /
* | | 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
| * | Check MR state before submitting queries for discussion stateosw-short-circuit-mergeable-disccusions-stateOswaldo Ferreira2018-01-291-0/+4
| | |
* | | Fix JIRA not working when a trailing slash is includedStan Hu2018-01-291-0/+23
|/ / | | | | | | | | | | | | | | Leaving a trailing slash in the context option causes the jira-ruby gem to add an extra slash in HTTP requests to the URL, preventing JIRA from working properly. Closes #42494
* | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix cache clear windows Closes #42487 See merge request gitlab-org/gitlab-ce!16740
| * | Replace : with _ in cache key versioningMatija Čupić2018-01-261-1/+1
| |/
* | Fix an order dependency in a specNick Thomas2018-01-291-3/+3
| |
* | Close and do not reload MR diffs when source branch is deletedOswaldo Ferreira2018-01-291-1/+1
| |
* | Don't allow Repository#log with limit zeroJacob Vosmaer (GitLab)2018-01-291-15/+15
| |
* | Fix MR revert check when no merged_at is presentSean McGivern2018-01-291-10/+20
|/
* Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-251-18/+10
|\ | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-251-18/+10
| |
* | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-251-2/+12
|\ \ | |/ |/| | | | | | | | | Look at system notes created just before merge as well as after, when deciding if an MR can be reverted Closes #42377 See merge request gitlab-org/gitlab-ce!16678
| * Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds, while `MergeRequest::Metrics#merged_at` does. This breaks the optimization assumption that we only need to search for notes created *after* the MR has been merged. Unsynchronized system clocks also make this a dangerous assumption to make. Adding a minute of leeway still optimizes away most notes, but allows both cases to be handled more gracefully. If the system clocks are more than a minute out, we'll still be broken, of course.
* | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-0/+11
|\ \ | | | | | | | | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
| * | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-0/+11
| |/ | | | | | | Related to #39805