summaryrefslogtreecommitdiff
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-0721-87/+276
|\ | | | | | | | | | | | | 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-063-11/+4
| |
| * correctly updates commit data after committing changesPhil Hughes2017-11-0612-84/+180
| | | | | | | | | | 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
| * added refs_controller_specPhil Hughes2017-11-061-3/+15
| |
| * 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-076-4/+124
|\ \ | | | | | | | | | | | | | | | | | | Make sure that every job has a stage assigned Closes #37979 See merge request gitlab-org/gitlab-ce!14724
| * | Fix pipeline entity test related to stagesfix/gb/ensure-that-job-belongs-to-stageGrzegorz Bizon2017-11-061-1/+1
| | |
| * | Fix cycle analytics specsGrzegorz Bizon2017-11-061-0/+1
| | |
| * | Extract ensure stage service from commit status classGrzegorz Bizon2017-11-063-27/+43
| | |
| * | Use existing pipeline stage if stage already existsGrzegorz Bizon2017-11-062-3/+34
| | |
| * | Make sure that every job has a stage assignedGrzegorz Bizon2017-11-062-3/+75
| | |
* | | Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'Kamil Trzciński2017-11-075-4/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-072-2/+2
| | | |
| * | | Resolve conflictsbikebilly2017-11-07280-2807/+5137
| |\ \ \
| * | | | Add changelogbikebilly2017-11-061-0/+5
| | | | |
| * | | | Change default cluster size to n1-standard-2bikebilly2017-11-065-5/+5
| | | | |
* | | | | Merge branch '39648-fix-gke-wording' into 'master'Filipa Lacerda2017-11-073-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix GKE wording" Closes #39648 See merge request gitlab-org/gitlab-ce!15204
| * | | | | Resolve "Fix GKE wording"Fabio Busatto2017-11-073-4/+4
|/ / / / /
* | | | | Merge branch ↵Rémy Coutable2017-11-073-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-063-1/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-075-14/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-requestRémy Coutable2017-11-061-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | 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>
| * | | | | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-064-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mitigate a N+1 requests to Gitaly problem. Still one left. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-0733-15/+240
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593
| * | | | | | Support custom attributes on groupsMarkus Koller2017-11-0613-4/+105
| | | | | | |
| * | | | | | Support custom attributes on projectsMarkus Koller2017-11-0622-13/+137
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-075-13/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changes_count to the merge requests API See merge request gitlab-org/gitlab-ce!15178
| * | | | | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-035-13/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This returns the `real_size` of the MR's diff, which is a string indicating the number of changes. If the diff overflows after _n_ files, the string will be `$n+`.
* | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-076-12/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First iteration of Move Kubernetes from service to Cluster page See merge request gitlab-org/gitlab-ce!15061
| * | | | | | | Fix spec35616-move-gke-form-1st-iterationShinya Maeda2017-11-071-2/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-06245-3135/+8101
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 35616-move-gke-form-1st-iteration
| * \ \ \ \ \ \ \ Merge remote-tracking branch ↵Kamil Trzcinski2017-11-06977-10136/+15020
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'origin/move-kubernetes-from-service-to-clusters-page-10-2-ver' into 35616-move-gke-form-1st-iteration
| | * \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into ↵move-kubernetes-from-service-to-clusters-page-10-2-verShinya Maeda2017-11-0619-91/+303
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| | * \ \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into ↵Shinya Maeda2017-11-05242-1261/+1889
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| | * | | | | | | | | | Fixed controller specShinya Maeda2017-11-041-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into ↵Shinya Maeda2017-11-046-11/+40
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver
| * | | | | | | | | | | | Workaround today the failure in testsKamil Trzcinski2017-11-031-1/+2
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix page titleFilipa Lacerda2017-11-031-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Adds check for existing clusterFilipa Lacerda2017-11-031-5/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Fix static anlysysShinya Maeda2017-11-021-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix pipeline. Fix routing when validation failed.Shinya Maeda2017-11-015-7/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Fix paths to the first pageKamil Trzcinski2017-11-014-14/+11
| | | | | | | | | | | |
| * | | | | | | | | | | 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
| | | | | | | | | | | | |
View Lorry Controller Status