summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* More fixes from reviewwiki-gitlab-gitJacob Vosmaer2017-10-031-1/+1
|
* Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer2017-10-032-41/+26
|
* Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-10-031-2/+18
|\ | | | | | | | | | | | | Resolve "Cannot rename a hashed project" Closes #38202 See merge request gitlab-org/gitlab-ce!14428
| * Doesn't check if path exists on disk when renaming a hashed projectDouglas Barbosa Alexandre2017-10-021-2/+18
| |
* | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-033-0/+55
|\ \ | | | | | | | | | | | | 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-023-12/+10
| |\ \
| * | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+8
| | | |
| * | | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? methodValery Sizov2017-09-291-1/+1
| | | |
| * | | [Port semi-linear history from EE] Move migration to CE and `merge_method` ↵Valery Sizov2017-09-291-1/+13
| | | | | | | | | | | | | | | | method
| * | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-286-25/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb
| * \ \ \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2611-48/+48
| |\ \ \ \
| * | | | | Add spec for FfMergeServiceValery Sizov2017-09-191-1/+0
| | | | | |
| * | | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-192-0/+36
| | | | | |
* | | | | | Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-021-0/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Improved file logging for authentication events See merge request gitlab-org/gitlab-ce!9196
| * | | | | Remove lock reason and add guard clauseBrian Neel2017-09-291-1/+1
| | | | | |
| * | | | | Merge conflict resolutionBrian Neel2017-09-271-6/+6
| | | | | |
| * | | | | # This is a combination of 1 commit.Brian Neel2017-09-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # This is the 1st commit message: Add logging for all web authentication events # This is the commit message #2: Re-add underscore to after_inactive_sign_up_path_for # This is the commit message #3: Standardize on username= # This is the commit message #4: after_filter -> after_action, _resource -> resource # This is the commit message #5: Add two-factor login failures and account lockouts # This is the commit message #6: Move logging from two-factor concern to user model # This is the commit message #7: Add spaces around default parameter assignments # This is the commit message #8: Move logs out of user model # This is the commit message #9: Replace filtered_params with user_params # This is the commit message #10: Standardize case # This is the commit message #1: Fixes for username and AppLogger.info
* | | | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-021-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix/gpg/case-insensitive' into 'master'Dmitriy Zaporozhets2017-10-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Make GPG validation case insensitive See merge request gitlab-org/gitlab-ce!14376
| * | | | | | Make GPG validation case insensitive.Tim Bishop2017-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+5
| | | | | | |
* | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cacheStan Hu2017-10-011-3/+6
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Repository#has_visible_content?` used to rely on the cached count of local branches, but since it is now an independently cached value it needs to be invalidated on its own. Closes #38646
* | | | | | Create repositories via GitalyJacob Vosmaer2017-09-292-2/+2
| | | | | |
* | | | | | Make Repository#has_visible_content more efficientJacob Vosmaer (GitLab)2017-09-291-7/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'hashed-storage-migration-path' into 'master'Douwe Maan2017-09-282-2/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed storage migration path Closes gitlab-ee#3118 See merge request gitlab-org/gitlab-ce!14067
| * | | | | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-pathGabriel Mazetto2017-09-282-2/+40
| | | | | |
* | | | | | Support custom attributes on usersMarkus Koller2017-09-282-0/+8
|/ / / / /
* | | | | Merge branch 'zj-repo-gitaly' into 'master'Sean McGivern2017-09-281-17/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RepositoryExists is always called with #gitaly_migration Closes #38333 See merge request gitlab-org/gitlab-ce!14513
| * | | | | RepositoryExists is always called with #gitaly_migrationZeger-Jan van de Weg2017-09-261-17/+1
| | |_|_|/ | |/| | |
* | | | | refactor emails servicerefactor-servicesJames Lopez2017-09-281-2/+2
| | | | |
* | | | | refactor users update serviceJames Lopez2017-09-281-3/+3
| | | | |
* | | | | refactor services to match EE signatureJames Lopez2017-09-281-5/+5
| |_|/ / |/| | |
* | | | Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master'Kamil Trzciński2017-09-271-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Refactor a service responsible for creating a pipeline Closes #37563 and #34415 See merge request gitlab-org/gitlab-ce!14482
| * | | Move related pipeline class to new pipeline moduleGrzegorz Bizon2017-09-251-1/+1
| | | |
* | | | Merge branch 'avatar_n_plus_one' into 'master'Rémy Coutable2017-09-261-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow n+1s caused by avatar fetches on the project dashboard. See… See merge request gitlab-org/gitlab-ce!14475
| * | | | Allow n+1s caused by avatar fetches on the project dashboard. See ↵avatar_n_plus_oneAndrew Newdigate2017-09-251-2/+5
| | |/ / | |/| | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
* | | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'Robert Speicher2017-09-261-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors Closes #38100 See merge request gitlab-org/gitlab-ce!14438
| * | | | Remove unnecessary commentsDouwe Maan2017-09-251-2/+0
| | | | |
| * | | | Properly compare diff refs and diff positions when shas are truncatedDouwe Maan2017-09-251-5/+6
| |/ / /
* | | | Fix locked shared runners problemTomasz Maczukin2017-09-251-1/+1
| |/ / |/| |
* | | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-233-19/+23
|/ /
* | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replaceLin Jen-Shin2017-09-221-0/+1
| | | | | | | | | | | | See: * https://www.kernel.org/pub/software/scm/git/docs/git-replace.html * https://git-scm.com/book/en/v2/Git-Tools-Replace
* | Merge branch 'events-redundant-where' into 'master'Rémy Coutable2017-09-212-7/+7
|\ \ | | | | | | | | | | | | | | | | | | Remove redundant WHERE from event queries Closes #38129 See merge request gitlab-org/gitlab-ce!14389
| * | Remove redundant WHERE from event queriesevents-redundant-whereYorick Peterse2017-09-202-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default scope in Event would add a "WHERE author_id IS NOT NULL" clause to every query. Now that "events.author_id" has a NOT NULL clause set this filter is redundant and we can safely remove it. In this commit we also add a validation on events.author_id (previously only defined in PushEvent) just in case something tries to create data without an author ID. This way we can present a nicer error message compared to PostgreSQL's foreign key error messages. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38129
* | | Merge branch 'remove-use-key-worker' into 'master'Rémy Coutable2017-09-211-6/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stop using Sidekiq for updating Key#last_used_at Closes #36663 See merge request gitlab-org/gitlab-ce!14391
| * | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-201-6/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
* | | Merge branch 'fix-counts-caching' into 'master'Douwe Maan2017-09-202-4/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix refreshing of issues/MR count caches Closes #38061 See merge request gitlab-org/gitlab-ce!14363
| * | Fix refreshing of issues/MR count cachesfix-counts-cachingYorick Peterse2017-09-192-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the open issues/MR count caches are refreshed properly when creating new issues or MRs. This MR also includes a change to the cache keys to ensure all caches are rebuilt on the fly. This particular problem was not caught in the test suite due to a null cache being used, resulting in all calls that would use a cache using the underlying data directly. In production the code would fail because a newly saved record returns an empty hash in #changes meaning checks such as `state_changed? || confidential_changed?` would return false for new rows, thus never updating the counters. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38061