summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'Fatih Acet2018-01-051-4/+4
|\ | | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox Closes #41563 See merge request gitlab-org/gitlab-ce!16244
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2018-01-0522-147/+149
| |\ | | | | | | | | | 41563-fix-branch-creation-from-issue-in-firefox
| * | Fix custom name in branch creation for issue in Firefox41563-fix-branch-creation-from-issue-in-firefoxEric Eastwood2018-01-041-4/+4
| | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41563 `event.srcElement` is non-standard, https://developer.mozilla.org/en-US/docs/Web/API/Event/srcElement
* | | Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda2018-01-0519-3/+284
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-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
* | | | Merge branch 'remove-project-repo' into 'master'Sean McGivern2018-01-052-6/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
| * | | | Remove the Project#repo methodJacob Vosmaer2018-01-042-6/+2
| | | | |
* | | | | Merge branch 'backport-issue_3413' into 'master'Sean McGivern2018-01-052-3/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
| * | | | | EE-BACKPORT group boardsFelipe Artur2018-01-042-3/+24
| | | | | |
* | | | | | Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master'Tim Zallmann2018-01-052-0/+55
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Backport of methods and components added in EE See merge request gitlab-org/gitlab-ce!16208
| * | | | | Use computed prop in expand buttonce-4348-show-dast-results-in-the-mr-widgetFilipa Lacerda2018-01-051-1/+1
| | | | | |
| * | | | | Backport of methods and components added in EBackport of methods and ↵Filipa Lacerda2018-01-032-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | components added in EEE
* | | | | | Merge branch 'jivl-fix-import-project-url-bug' into 'master'Tim Zallmann2018-01-051-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import project url not updating project name Closes #40607 See merge request gitlab-org/gitlab-ce!16120
| * | | | | | Fix import project url not updating project namejivl-fix-import-project-url-bugJose Ivan Vargas2018-01-031-3/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'winh-modal-target-id' into 'master'Filipa Lacerda2018-01-0510-92/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add id to modal.vue to support data-toggle="modal" Closes #41584 See merge request gitlab-org/gitlab-ce!16189
| * | | | | | Add id to modal.vue to support data-toggle="modal"Winnie Hellmann2018-01-0510-92/+91
| | | | | | |
* | | | | | | Merge branch 'refactor-cluster-show-page-conservative' into 'master'Filipa Lacerda2018-01-059-42/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor cluster show page Closes #41335 See merge request gitlab-org/gitlab-ce!16089
| * | | | | | | Add back bottom margins for integration formrefactor-cluster-show-page-conservativeMatija Čupić2018-01-051-2/+2
| | | | | | | |
| * | | | | | | Update Remove cluster subtitle and alertMatija Čupić2018-01-041-2/+2
| | | | | | | |
| * | | | | | | Update Advanced cluster settings subtitleMatija Čupić2018-01-041-1/+1
| | | | | | | |
| * | | | | | | Rename enabled partial to integration_formMatija Čupić2017-12-213-2/+3
| | | | | | | |
| * | | | | | | Environment pattern -> Environment scopeMatija Čupić2017-12-212-2/+2
| | | | | | | |
| * | | | | | | Add environment_scope to enabled partialMatija Čupić2017-12-213-17/+25
| | | | | | | |
| * | | | | | | Remove environment_scope in user/gcp show partialMatija Čupić2017-12-212-8/+0
| | | | | | | |
* | | | | | | | Merge branch '40533-fix-item-stats-props' into 'master'Filipa Lacerda2018-01-051-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Enclose props in double quotes for Item Stats in Groups tree app See merge request gitlab-org/gitlab-ce!16231
| * | | | | | | Use `__` instead of `s__` when context is not required40533-fix-item-stats-propsKushal Pandya2018-01-041-3/+3
| | | | | | | |
| * | | | | | | Enclose props in quotesKushal Pandya2018-01-041-4/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
| | | | | | | |
View Lorry Controller Status