summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-092-6/+2
|
* 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
| | | |
* | | | Update project full path in .git/config when renaming a repositoryDouglas Barbosa Alexandre2018-01-031-0/+5
| | | |
* | | | Write project full path to .git/config when creating projectsDouglas Barbosa Alexandre2018-01-031-0/+5
| | | | | | | | | | | | | | | | We'd need to keep track of project full path otherwise directory tree created with hashed storage enabled cannot be usefully imported using the import rake task.
* | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-031-1/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| * | | refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-importJames Lopez2018-01-031-1/+1
| | | |
| * | | refactor code to use new import typeJames Lopez2018-01-031-0/+4
| |/ /
* | | Fix user membership destroy relationFrancisco Javier López2018-01-021-3/+3
|/ /
* | Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-291-2/+7
| |
* | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-251-4/+0
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
| * | Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-221-4/+0
| | |
* | | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵Rémy Coutable2017-12-232-21/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069
| * | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-222-21/+9
| |/
* | Merge branch 'dm-diff-note-for-line-performance' into 'master'Robert Speicher2017-12-224-20/+6
|\ \ | | | | | | | | | | | | | | | | | | Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison Closes #41406 See merge request gitlab-org/gitlab-ce!16111
View Lorry Controller Status