summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-widthPhil Hughes2017-11-074-3/+10
|
* Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-0717-77/+213
|\ | | | | | | | | | | | | Multi-file editor fetch log data from a different endpoint Closes #38360 See merge request gitlab-org/gitlab-ce!15132
| * fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-062-2/+3
| | | | | | | | updated controller based on review
| * moved key into data structurePhil Hughes2017-11-064-5/+12
| | | | | | | | uses an array of classes to render skeleton loading cells
| * fixed specsPhil Hughes2017-11-061-1/+1
| |
| * correctly updates commit data after committing changesPhil Hughes2017-11-0610-81/+129
| | | | | | | | | | also merges data in after a fetch to save overriting all data. changed the render keys to save a full re-render when any data changes
| * only allow the call when not in collapsed viewPhil Hughes2017-11-062-2/+4
| | | | | | | | [ci skip]
| * Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-0613-26/+104
| | | | | | | | Closes #38360
* | Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-072-1/+50
|\ \ | | | | | | | | | | | | | | | | | | Make sure that every job has a stage assigned Closes #37979 See merge request gitlab-org/gitlab-ce!14724
| * | Extract ensure stage service from commit status classGrzegorz Bizon2017-11-062-27/+42
| | |
| * | Use existing pipeline stage if stage already existsGrzegorz Bizon2017-11-061-3/+11
| | |
| * | Make sure that every job has a stage assignedGrzegorz Bizon2017-11-061-1/+27
| | |
* | | Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'Kamil Trzciński2017-11-072-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change default size for GKE cluster creation" Closes #39649 See merge request gitlab-org/gitlab-ce!15220
| * | | Change new occurrencies of n1-default-439649-change-default-size-for-gke-cluster-creationbikebilly2017-11-071-1/+1
| | | |
| * | | Resolve conflictsbikebilly2017-11-07117-865/+1153
| |\ \ \
| * | | | Change default cluster size to n1-standard-2bikebilly2017-11-062-2/+2
| | | | |
* | | | | Resolve "Fix GKE wording"Fabio Busatto2017-11-072-2/+2
| | | | |
* | | | | Merge branch ↵Rémy Coutable2017-11-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue' into 'master' Resolve "When reopening an issue the Mattermost Notification has no context to the issue" Closes #39791 See merge request gitlab-org/gitlab-ce!15218
| * | | | | Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-061-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an issue is reopened, the action is 'reopen', but the state is 'opened' (as we don't have a separate 'reopened' state any more). Because we checked the action in one method and the state in another, this lead to a weird case where the mesage neither linked to the issue, nor contained an attachment with its details. Just checking the action is fine, as it's the most granular.
* | | | | Merge branch ↵Douwe Maan2017-11-071-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request' into 'master' Fetch the merged branches at once in the `/projects/:id/repository/branches` endpoint See merge request gitlab-org/gitlab-ce!15215
| * | | | | Cache the root ref SHA in an instance variable in Repository#merged_to_root_ref?Rémy Coutable2017-11-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-076-1/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593
| * | | | | | Support custom attributes on groupsMarkus Koller2017-11-063-1/+14
| | | | | | |
| * | | | | | Support custom attributes on projectsMarkus Koller2017-11-063-0/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-073-8/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration of Move Kubernetes from service to Cluster page See merge request gitlab-org/gitlab-ce!15061
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-0693-548/+563
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 35616-move-gke-form-1st-iteration
| * \ \ \ \ \ \ Merge branch 'refactor-clusters' into ↵move-kubernetes-from-service-to-clusters-page-10-2-verShinya Maeda2017-11-068-57/+18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| * \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into ↵Shinya Maeda2017-11-0551-694/+852
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| * \ \ \ \ \ \ \ \ Merge branch '35616-move-gke-form-1st-iteration' into ↵Shinya Maeda2017-11-043-8/+32
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| | * | | | | | | | | Fix page titleFilipa Lacerda2017-11-031-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Adds check for existing clusterFilipa Lacerda2017-11-031-5/+12
| | | | | | | | | | |
| | * | | | | | | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-012-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Fix paths to the first pageKamil Trzcinski2017-11-013-14/+10
| | | | | | | | | | |
| | * | | | | | | | | Adds buttons to the first page.Filipa Lacerda2017-10-273-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves first page into a new one
* | | | | | | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-0714-76/+163
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] Saved configuration for issue board See merge request gitlab-org/gitlab-ce!15108
| * | | | | | | | | | | appease lint2518-saved-configuration-for-issue-boardSimon Knox2017-11-071-3/+1
| | | | | | | | | | | |
| * | | | | | | | | | | unused propSimon Knox2017-11-061-7/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-06132-1324/+1600
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | 2518-saved-configuration-for-issue-board
| * | | | | | | | | | | fix bad master mergeSimon Knox2017-11-021-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-0198-1987/+2312
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2518-saved-configuration-for-issue-board
| * | | | | | | | | | | | resolve conflictsSimon Knox2017-10-311-42/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | match UX guide for submit/cancel buttonsSimon Knox2017-10-311-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | apply changes for JS and CSS from gitlab-ee!2912Simon Knox2017-10-3115-65/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2912/
| * | | | | | | | | | | | Remove unnecessary helper methodOswaldo Ferreira2017-10-311-6/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Initial CE backport for saved issue boardOswaldo Ferreira2017-10-311-6/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'feature_change_sort_refs' into 'master'Douwe Maan2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change tags order in refs dropdown Closes #37336 See merge request gitlab-org/gitlab-ce!15235
| * | | | | | | | | | | | Change tags order in refs dropdownfeature_change_sort_refsVitaliy @blackst0ne Klachkov2017-11-071-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master'Tim Zallmann2017-11-075-32/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable multiple queries per Prometheus graph See merge request gitlab-org/gitlab-ce!15201
| * | | | | | | | | | | | | make legend X-offset into a constantmultiple-query-prometheus-graphsMike Greiling2017-11-062-6/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | fix eslint max-lineMike Greiling2017-11-061-1/+2
| | | | | | | | | | | | | |