summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Try to fix a transient failure39869-master-failing-due-to-spec-features-discussion_comments-merge_request_spec-rbRémy Coutable2017-11-071-0/+5
* Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-073-28/+29
|\
| * Fix TRIGGER checks for MySQLfix-mysql-grant-checkYorick Peterse2017-11-063-28/+29
* | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-0721-87/+276
|\ \
| * | fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-062-2/+3
| * | moved key into data structurePhil Hughes2017-11-064-5/+12
| * | fixed specsPhil Hughes2017-11-063-11/+4
| * | correctly updates commit data after committing changesPhil Hughes2017-11-0612-84/+180
| * | added refs_controller_specPhil Hughes2017-11-061-3/+15
| * | only allow the call when not in collapsed viewPhil Hughes2017-11-062-2/+4
| * | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-0613-26/+104
* | | Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-076-4/+124
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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"Fabio Busatto2017-11-073-4/+4
|/ / / / / /
* | | | | | Merge branch '39791-when-reopening-an-issue-the-mattermost-notification-has-n...Rémy Coutable2017-11-073-1/+19
|\ \ \ \ \ \
| * | | | | | Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-063-1/+19
| |/ / / / /
* | | | | | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-075-14/+17
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | Cache the root ref SHA in an instance variable in Repository#merged_to_root_ref?Rémy Coutable2017-11-061-3/+3
| * | | | | | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-064-8/+14
* | | | | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-0733-15/+240
|\ \ \ \ \ \ \
| * | | | | | | 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 APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-035-13/+53
* | | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into 'master'Grzegorz Bizon2017-11-076-12/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix spec35616-move-gke-form-1st-iterationShinya Maeda2017-11-071-2/+1
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 35616-move-gke-form-1st-ite...Kamil Trzcinski2017-11-06245-3135/+8101
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/move-kubernetes-from-service-to-clusters...Kamil Trzcinski2017-11-06977-10136/+15020
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...move-kubernetes-from-service-to-clusters-page-10-2-verShinya Maeda2017-11-0619-91/+303
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-cluster...Shinya Maeda2017-11-05242-1261/+1889
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed controller specShinya Maeda2017-11-041-1/+1
| | * | | | | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into move-kubernetes-from-se...Shinya Maeda2017-11-046-11/+40
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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