summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Fix Route validation for unchanged path""Michael Kozono2018-01-111-1/+1
| | | | This reverts commit 3576d59ae95a61dd20e997a619dbc6c8e8a70276.
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-1111-0/+11
|
* Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-116-17/+10
|\ | | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
| * Remove soft removals related codeYorick Peterse2018-01-086-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-111-4/+7
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
| * | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | For each MR diff an extra 'SELECT COUNT()' is executed to get number of commits for the diff. Overall time to get counts for all MR diffs may be quite expensive. To speed up loading of MR info, information about number of commits is stored in a MR diff's extra column. Closes #38068
* | | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-102-6/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
| * | | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-092-6/+2
| | | |
* | | | Fix hooks not being set up properly for bare import Rake tasksh-fix-bare-import-hooksStan Hu2018-01-091-0/+4
| |/ / |/| | | | | | | | Closes #41739
* | | Revert "Fix Route validation for unchanged path"Michael Kozono2018-01-091-1/+1
| | | | | | | | | | | | This reverts commit 8040edcce8b4e736b4f4857e6709f94aeb5e274c.
* | | Fix Route validation for unchanged pathMichael Kozono2018-01-091-1/+1
| | |
* | | Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-091-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014
| * | Backport option to disable writing to `authorized_keys` fileMichael Kozono2018-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally branch 'mk-toggle-writing-to-auth-keys-1631' See merge request !2004 Squashed commits: Add authorized_keys_enabled to Application Settings Ensure default settings are exposed in UI Without this change, `authorized_keys_enabled` is unchecked when it is nil, even if it should be checked by default. Add “Speed up SSH operations” documentation Clarify the reasons for disabling writes Add "How to go back" section Tweak copy Update Application Setting screenshot
* | | Merge branch '28260-fix-pages-custom-domain-url' into 'master'Grzegorz Bizon2018-01-081-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Fix wrong output protocol pattern when adding custom domain to Pages" Closes #28260 See merge request gitlab-org/gitlab-ce!16279
| * | Generate HTTP URLs for custom Pages domains when appropriateNick Thomas2018-01-081-1/+1
| | |
* | | Merge branch 'remove-commit-tree' into 'master'Sean McGivern2018-01-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove the Commit#tree method See merge request gitlab-org/gitlab-ce!16236
| * | | Remove the Commit#tree methodremove-commit-treeJacob Vosmaer2018-01-041-1/+1
| | | |
* | | | Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵Douwe Maan2018-01-081-0/+22
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198
| * | | Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-importTiago Botelho2018-01-061-0/+22
| |/ /
* | | Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'Kamil Trzciński2018-01-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix restoring associations with import/export Closes #41646 See merge request gitlab-org/gitlab-ce!16221
| * \ \ Merge branch 'master' into fix/gb/fix-import-export-restoring-associationsGrzegorz Bizon2018-01-069-87/+116
| |\ \ \ | | | | | | | | | | | | | | | * master: (114 commits)
| * | | | Assign stage and pipeline to a status when importingGrzegorz Bizon2018-01-051-1/+1
| | |/ / | |/| |
* | | | Merge branch '41249-clearing-the-cache' into 'master'Kamil Trzciński2018-01-061-1/+8
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Resolve "Clearing the cache" Closes #41249 See merge request gitlab-org/gitlab-ce!16067
| * | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-057-24/+94
| |\ \ \
| * \ \ \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-0413-50/+106
| |\ \ \ \
| * | | | | Refactor Ci::Build#cacheMatija Čupić2018-01-041-4/+7
| | | | | |
| * | | | | Rename Project#cache_index to jobs_cache_indexMatija Čupić2018-01-041-2/+2
| | | | | |
| * | | | | Use Project.cache_index in Build#cacheMatija Čupić2017-12-221-1/+5
| | | | | |
* | | | | | Move git operations for multi_action into Gitlab::GitAlejandro Rodríguez2018-01-051-58/+9
| |_|/ / / |/| | | |
* | | | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-5/+7
| | | | |
* | | | | Merge branch 'ce-backport=reorder-issues' into 'master'Sean McGivern2018-01-052-7/+17
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 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-051-1/+1
| | | | |
| * | | | Refactor RelativePositioning so that it can be used by other classesJarka Kadlecová2018-01-052-7/+17
| | | | |
* | | | | Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda2018-01-052-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-1/+15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
| * | | | Remove the Project#repo methodJacob Vosmaer2018-01-041-5/+1
| | |_|/ | |/| |
* | | | Just try to detect and assign onceLin Jen-Shin2018-01-051-3/+4
| | | |
* | | | Create Kubernetes based on Application TemplatesMayra Cabrera2018-01-043-6/+53
| |_|/ |/| |
* | | Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix'Dmitriy Zaporozhets2018-01-041-4/+1
|\ \ \ | | | | | | | | | | | | 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-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-1/+12
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 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-041-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-043-14/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-023-14/+12
| |/ / /
* | | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-042-0/+36
| | | |
* | | | Write projects config to all projects inside namespace in batchesDouglas Barbosa Alexandre2018-01-032-3/+3
| | | |
* | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-032-9/+8
| | | |
* | | | Handle exceptions when writing to .git/configDouglas Barbosa Alexandre2018-01-031-0/+3
| | | |
* | | | Update project full path in .git/config when renaming namespaceDouglas Barbosa Alexandre2018-01-032-0/+9
| | | |
View Lorry Controller Status