summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into ↵5029-support-cluster-metrics-cePawel Chojnacki2018-03-061193-16194/+18833
|\ | | | | | | | | | | | | 5029-support-cluster-metrics-ce # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb
| * Merge branch 'an/network-controller-fix' into 'master'Sean McGivern2018-03-063-20/+17
| |\ | | | | | | | | | | | | | | | | | | Fix Gitaly n+1 in NetworkController#show Closes #37602 and gitaly#1056 See merge request gitlab-org/gitlab-ce!17548
| | * Fix Gitaly n+1 in NetworkController#showAndrew Newdigate2018-03-063-20/+17
| |/
| * Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵Rémy Coutable2018-03-0614-50/+338
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
| | * Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-0614-50/+338
| | |
| * | Merge branch 'zj-lock-grpc-gem' into 'master'Rémy Coutable2018-03-062-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Lock gRPC gem to 1.8 Closes gitaly#1059 See merge request gitlab-org/gitlab-ce!17484
| | * | Lock gRPC gem to 1.8Zeger-Jan van de Weg2018-03-062-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Given 1.9 has issues we're aware of, for now we're locking to 1.8. Closes gitlab-org/gitaly#1059 and will probably be removed if 1.10 is tested an deemed ok.
| * | | Merge branch 'fix/sm/fix_pages_worker' into 'master'Kamil Trzciński2018-03-065-15/+45
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
| | * | | Revert unnecessary code running_or_pending_build_count removalShinya Maeda2018-03-063-0/+9
| | | | |
| | * | | Add test for ensuring the file remains after socker errorShinya Maeda2018-03-061-0/+3
| | | | |
| | * | | Fix typo in changelogShinya Maeda2018-03-061-1/+1
| | | | |
| | * | | Fix staticanalysysfix/sm/fix_pages_workerShinya Maeda2018-03-061-1/+1
| | | | |
| | * | | Introduce FailedToExtractError. Fix spec. Add DNS test mock.Shinya Maeda2018-03-064-10/+22
| | | | |
| | * | | Add changelogShinya Maeda2018-03-061-0/+5
| | | | |
| | * | | Add empty line after custom error difinitionShinya Maeda2018-03-061-0/+1
| | | | |
| | * | | Drop running_or_pending_build_countShinya Maeda2018-03-062-7/+0
| | | | |
| | * | | Fix commentShinya Maeda2018-03-061-1/+1
| | | | |
| | * | | Rework to minimize changesShinya Maeda2018-03-062-9/+16
| | | | |
| * | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-03-061-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | perforce.md: add note about repacking See merge request gitlab-org/gitlab-ce!17373
| | * | | | perforce.md: add note about repackingpatch-28Christian Couder2018-03-011-0/+6
| | | | | |
| * | | | | Merge branch '43299-revert-bad-merge' into 'master'Phil Hughes2018-03-062-33/+36
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group Leave action is broken on Groups Dashboard and Homepage" Closes #43299 See merge request gitlab-org/gitlab-ce!17183
| | * | | | | Resolve "Group Leave action is broken on Groups Dashboard and Homepage"Shah El-Rahman2018-03-062-33/+36
| |/ / / / /
| * | | | | Merge branch '43670-improve-gitlab-kubernetes-cpu-metrics' into 'master'Tim Zallmann2018-03-062-15/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitLab Kubernetes CPU metrics Closes #43670 and #43462 See merge request gitlab-org/gitlab-ce!17403
| | * | | | | Fix doc link43670-improve-gitlab-kubernetes-cpu-metricsJoshua Lambert2018-02-281-1/+1
| | | | | | |
| | * | | | | Further updates to docsJoshua Lambert2018-02-281-5/+4
| | | | | | |
| | * | | | | Update docsJoshua Lambert2018-02-281-1/+1
| | | | | | |
| | * | | | | Final updates for metricsJoshua Lambert2018-02-281-3/+3
| | | | | | |
| | * | | | | Update docsJoshua Lambert2018-02-281-4/+2
| | | | | | |
| | * | | | | Fix k8s metricsJoshua Lambert2018-02-271-5/+5
| | | | | | |
| * | | | | | Merge branch 'docs/review-apps-triggers' into 'master'Rémy Coutable2018-03-061-9/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition when previewing docs Closes gitlab-com/gitlab-docs#154 et #41024 See merge request gitlab-org/gitlab-ce!17552
| | * | | | | | Fix race condition when previewing docsAchilleas Pipinellis2018-03-061-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancel the pipeline that gets created the first time the remote branch is created in order not to overwrite the one we trigger afterwards. Closes https://gitlab.com/gitlab-com/gitlab-docs/issues/154
| * | | | | | | Merge branch 'fix-changelog-entry-yaml-docs' into 'master'Rémy Coutable2018-03-061-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fix a changelog entry YAML to be consistent with EE See merge request gitlab-org/gitlab-ce!17554
| | * | | | | | So that it's consistent with other entries and EELin Jen-Shin2018-03-061-0/+1
| |/ / / / / /
| * | | | | | Merge branch 'remove-default-scope-from-todos' into 'master'Yorick Peterse2018-03-063-21/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove default scope from todos See merge request gitlab-org/gitlab-ce!17531
| | * | | | | | Remove default scope from todosremove-default-scope-from-todosSean McGivern2018-03-053-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing todo priority sorting to fail.
| * | | | | | | Merge branch '38587-pipelines-empty-state' into 'master'Phil Hughes2018-03-0616-432/+986
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipelines view should handle empty state and buttons properly" Closes #38587 See merge request gitlab-org/gitlab-ce!17433
| | * | | | | | | Changes after review38587-pipelines-empty-stateFilipa Lacerda2018-03-057-46/+35
| | | | | | | | |
| | * | | | | | | [ci skip] Merge branch 'master' into 38587-pipelines-empty-stateFilipa Lacerda2018-03-05186-1257/+4854
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (52 commits) Projects and groups badges API Keep a commit around if its sha is present #43691: DiffNotes not counted by ContributionsCalendar Cleanup after adding MR diff's commit_count Fix MR merge commit cross-references to the MR itself Fix n+1 issue by not reloading fully loaded blobs Add "added" type on changelog Use limited count queries also for scoped searches Update changelog Rename quick actions handler Adds updated_at filter to issues and merge_requests API Update API: add search param to branches Add changelog entry LabelsSelect DropdownValueCollapsed Component LabelsSelect DropdownValue Component LabelsSelect DropdownTitle Component LabelsSelect DropdownSearchInput Component LabelsSelect DropdownHiddenInput Component LabelsSelect DropdownHeader Component LabelsSelect DropdownFooter Component ...
| | * | | | | | | | Fix broken empty tab stateFilipa Lacerda2018-03-051-1/+1
| | | | | | | | | |
| | * | | | | | | | Manage empty states in Pipelines pageFilipa Lacerda2018-03-0518-431/+996
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds i18n Adds test Fix broken tests Fixes empty tab state for external CI
| * | | | | | | | | Merge branch 'feature/sm/add-check-sum-to-job-artifacts' into 'master'Kamil Trzciński2018-03-065-1/+19
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add checksum to ci_job_artifacts Closes #43599 See merge request gitlab-org/gitlab-ce!17354
| | * | | | | | | | Change column to file_sha256. Add test. Add changelogShinya Maeda2018-03-065-4/+13
| | | | | | | | | |
| | * | | | | | | | Add checksum at runner grape apiShinya Maeda2018-03-061-1/+2
| | | | | | | | | |
| | * | | | | | | | Revert logic of calculating checksumShinya Maeda2018-03-068-90/+0
| | | | | | | | | |
| | * | | | | | | | Add post migration for checksum calculationShinya Maeda2018-03-063-0/+38
| | | | | | | | | |
| | * | | | | | | | Add ObjectStorageQueue concern and testShinya Maeda2018-03-062-0/+27
| | | | | | | | | |
| | * | | | | | | | Import use_file method from EE and use it for calculation of checksumShinya Maeda2018-03-062-1/+11
| | | | | | | | | |
| | * | | | | | | | Change column type to binary from stringShinya Maeda2018-03-062-3/+2
| | | | | | | | | |
| | * | | | | | | | Add checksum to ci_job_artifactsShinya Maeda2018-03-064-0/+24
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge branch '43793-enable-privileged-mode-for-runner' into 'master'Kamil Trzciński2018-03-066-5/+58
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable privileged mode for Runner installed on Kubernetes" Closes #43793 See merge request gitlab-org/gitlab-ce!17528
View Lorry Controller Status