summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-0519-3/+284
| | | | | | | | | | | | | | 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
* 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 'issue-boards-scroll' into 'master'Jacob Schatz2018-01-041-1/+1
|\ | | | | | | | | | | | | Scroll to top/bottom in issue board when reach to edges Closes #39709 See merge request gitlab-org/gitlab-ce!16239
| * Fix issue boards scroll config.issue-boards-scrollFatih Acet2018-01-041-1/+1
| |
* | Merge branch 'fix-missing-d3-import' into 'master'Jacob Schatz2018-01-041-2/+12
|\ \ | | | | | | | | | | | | | | | | | | Fix missing d3 timeWeek import in prometheus graph Closes #41644 See merge request gitlab-org/gitlab-ce!16216
| * | fix missing import of timeWeek which would cause errors in prometheus graphs ↵fix-missing-d3-importMike Greiling2018-01-041-2/+12
| | | | | | | | | | | | with deployments
* | | Added multi editor setting on the profile preferences pageJose Ivan Vargas2018-01-048-1/+62
| | |
* | | 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 'jramsay-41590-add-readme-case' into 'master'Douwe Maan2018-01-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove downcase from special path helper Closes #41590 See merge request gitlab-org/gitlab-ce!16232
| * | | | Remove downcase from special path helperJames Ramsay2018-01-041-1/+1
| | | | |
* | | | | 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 '40533-groups-tree-updates' into 'master'Filipa Lacerda2018-01-0410-94/+207
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Groups tree enhancements Closes #40533 See merge request gitlab-org/gitlab-ce!15980
| * | | | | Make tooltip placement bottom by default as per design guidelines40533-groups-tree-updatesKushal Pandya2018-01-043-2/+4
| | | | | |
| * | | | | Fix groups list icon, timestamp alignment and row heightKushal Pandya2018-01-041-3/+24
| | | | | |
| * | | | | Update styles to fix SVG caret alignmentKushal Pandya2017-12-281-1/+7
| | | | | |
| * | | | | Use SVG sprite iconsKushal Pandya2017-12-281-5/+10
| | | | | |
| * | | | | Use ItemStatValue component for project star countKushal Pandya2017-12-261-5/+5
| | | | | |
| * | | | | Make `title` optionalKushal Pandya2017-12-261-1/+2
| | | | | |
| * | | | | Update styles to show `updatedAt`Kushal Pandya2017-12-261-9/+34
| | | | | |
| * | | | | Use ItemStatsValue Component, add `updatedAt` info for projectsKushal Pandya2017-12-261-51/+37
| | | | | |
| * | | | | ItemStatsValue ComponentKushal Pandya2017-12-261-0/+67
| | | | | |
| * | | | | Update avatar size to be 24pxKushal Pandya2017-12-261-3/+5
| | | | | |
| * | | | | Update icon name to use from SVG spriteKushal Pandya2017-12-261-3/+3
| | | | | |
| * | | | | Use SVG sprite iconsKushal Pandya2017-12-262-17/+14
| | | | | |
| * | | | | Add `updatedAt` prop for ProjectsKushal Pandya2017-12-261-0/+1
| | | | | |
| * | | | | Reduce font size for 24px identiconKushal Pandya2017-12-261-1/+1
| | | | | |
* | | | | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-0415-55/+132
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| * | | | | | Simplify metrics fetching for closed/merged MRsosw-introduce-merge-request-statisticsOswaldo Ferreira2018-01-031-6/+5
| | | | | | |
| * | | | | | Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | closed/merged
| * | | | | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-0215-55/+129
| | | | | | |
* | | | | | | Merge branch '41054-disable-creation-of-new-kubernetes-integrations' into ↵Kamil Trzciński2018-01-049-10/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 41054-Disallow creation of new Kubernetes integrations Closes #41054 See merge request gitlab-org/gitlab-ce!16017
| * | | | | | | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-049-10/+64
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Resolve "Resizable file list and commit panel"Tim Zallmann2018-01-049-5/+203
|/ / / / / /
* | | | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into ↵Robert Speicher2018-01-036-1/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle GitLab hashed storage repositories using the repo import task Closes #39870 See merge request gitlab-org/gitlab-ce!16027
| * | | | | | Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-taskDouglas Barbosa Alexandre2018-01-031-3/+3
| | | | | | |
| * | | | | | Fix Projects::TransferService#write_repository_config methodDouglas Barbosa Alexandre2018-01-031-1/+1
| | | | | | |
| * | | | | | Write projects config to all projects inside namespace in batchesDouglas Barbosa Alexandre2018-01-032-3/+3
| | | | | | |
| * | | | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-035-25/+12
| | | | | | |
| * | | | | | Handle exceptions when writing to .git/configDouglas Barbosa Alexandre2018-01-031-0/+3
| | | | | | |
| * | | | | | Does not write to .git/config when importing bare repositoriesDouglas Barbosa Alexandre2018-01-031-5/+5
| | | | | | |
| * | | | | | Write project full path to .git/config when migrating legacy storageDouglas Barbosa Alexandre2018-01-031-0/+7
| | | | | | |
| * | | | | | Update project full path in .git/config when renaming namespaceDouglas Barbosa Alexandre2018-01-032-0/+9
| | | | | | |
| * | | | | | Update project full path in .git/config when transfering a projectDouglas Barbosa Alexandre2018-01-031-0/+10
| | | | | | |
| * | | | | | 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-032-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '13355-definition-margin' into 'master'Filipa Lacerda2018-01-031-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "reStructuredText rendering of definition lists" Closes #13355 See merge request gitlab-org/gitlab-ce!16202
| * | | | | | | Add left margin to definition elements13355-definition-marginAnnabel Dunstone Gray2018-01-031-0/+4
| | | | | | | |
View Lorry Controller Status