summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-073-5/+10
| | | | | | | | | | | | | | | | | We saw that in a customer instance, `empty?` was cached to be `true` even though `has_visible_content?` and `exists?` were `true`. This double caching can run into edge cases because there's no guarantee that the inner values will properly expire the outer one, especially if there is Redis replication lag. Consider this scenario: 1. `exists?` and `has_visible_content?` are false 2. `empty?` is expired 3. A subsequent call to `empty?` returns `true` because `exists?` is false even though `empty` is true 4. `exists?` and `has_visible_content?` are then expired 5. `exists?` and `has_visible_content?` are set to true 6. `empty?` is still stuck in the wrong value as `true` Closes #43882
* Merge branch 'remove-common-vue' into 'master'Clement Ho2018-03-0612-31/+8
|\ | | | | | | | | Remove common_vue bundle See merge request gitlab-org/gitlab-ce!17551
| * Remove common_vue bundleMike Greiling2018-03-0612-31/+8
|/
* Merge branch 'ee-183-common-code-backport' into 'master'Sean McGivern2018-03-062-1/+23
|\ | | | | | | | | Gitlab::Utils - backport `.ensure_array_from_string` from EE See merge request gitlab-org/gitlab-ce!17574
| * Gitlab::Utils - backport `.ensure_array_from_string` from EEMario de la Ossa2018-03-062-1/+23
|/
* Merge branch 'banzai-n-plus-one' into 'master'Douwe Maan2018-03-061-1/+2
|\ | | | | | | | | Gitaly N+1 notice on Banzai filtering See merge request gitlab-org/gitlab-ce!17540
| * Add Gitaly N+1 notice for Banzai filteringAlejandro Rodríguez2018-03-051-1/+2
| |
* | Merge branch ↵Kamil Trzciński2018-03-065-2/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master' Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace Closes #43919 See merge request gitlab-org/gitlab-ce!17572
| * | Change queue namespace of UpdateHeadPipelineForMergeRequestWorkerShinya Maeda2018-03-071-0/+2
| | |
| * | Move update_head_pipeline_for_merge_request queue to pipeline_processing ↵Shinya Maeda2018-03-074-2/+81
| | | | | | | | | | | | namespace
* | | Merge branch 'sha256-checksum-for-trace' into 'master'Kamil Trzciński2018-03-062-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Set sha256 checksum when archiving traces Closes #43940 See merge request gitlab-org/gitlab-ce!17570
| * | | Fix false positive spec of using digest instead of hexdigestShinya Maeda2018-03-071-4/+4
| | | |
| * | | Set sha256 checksum when archiving tracesShinya Maeda2018-03-072-1/+4
| |/ /
* | | Merge branch 'ce-3727-fe-labels-for-epics' into 'master'Filipa Lacerda2018-03-063-5/+7
|\ \ \ | | | | | | | | | | | | | | | | CE Port: Add `js-` classes in LabelsSelect component See merge request gitlab-org/gitlab-ce!17558
| * | | Backport description composition from EEce-3727-fe-labels-for-epicsKushal Pandya2018-03-061-2/+4
| | | |
| * | | Add `js-*` class to refer in JSKushal Pandya2018-03-062-3/+3
| | | |
* | | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'Phil Hughes2018-03-0612-108/+225
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cluster monitoring changes CE backport See merge request gitlab-org/gitlab-ce!17547
| * | | | prefer checking explicitly for nullMike Greiling2018-03-061-2/+2
| | | | |
| * | | | replace fixture with simple mount pointMike Greiling2018-03-062-39/+6
| | | | |
| * | | | add new tests for metrics dashboard changesMike Greiling2018-03-061-9/+34
| | | | |
| * | | | move misplaced entry pointcluster-monitoring-changes-ce-backportMike Greiling2018-03-061-0/+0
| | | | |
| * | | | coerce hasMetrics to a boolean value before instantiating the Vue componentMike Greiling2018-03-063-7/+11
| | | | |
| * | | | prefer getElementByIdMike Greiling2018-03-061-1/+1
| | | | |
| * | | | fix karma testsMike Greiling2018-03-061-1/+16
| | | | |
| * | | | remove prometheus panel styling on cluster monitoring pageMike Greiling2018-03-062-1/+21
| | | | |
| * | | | lighten axis tick textMike Greiling2018-03-061-1/+2
| | | | |
| * | | | add ability to override graph size measurementsMike Greiling2018-03-062-1/+12
| | | | |
| * | | | fix spacing around axis label text in small breakpointsMike Greiling2018-03-061-2/+3
| | | | |
| * | | | hide legend without hiding the axis labelsMike Greiling2018-03-062-35/+42
| | | | |
| * | | | add option to hide the graph legendMike Greiling2018-03-062-1/+15
| | | | |
| * | | | use proper dependency injection for monitoring dashboard componentMike Greiling2018-03-063-23/+69
| | | | |
| * | | | make deployments endpoint optionalMike Greiling2018-03-061-0/+3
| | | | |
| * | | | add prometheus cluster health monitoring empty stateMike Greiling2018-03-061-1/+4
| | | | |
* | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-0667-469/+1730
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring one group board to CE Closes #38337 See merge request gitlab-org/gitlab-ce!17274
| * \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-06543-11966/+29559
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * | | | | | Fix a typo, a conflict and improve documentationissue_38337Felipe Artur2018-03-063-2/+5
| | | | | | |
| * | | | | | Address review commentsFelipe Artur2018-03-059-47/+31
| | | | | | |
| * | | | | | Bring one group board to CEFelipe Artur2018-03-0366-469/+1744
| | | | | | |
* | | | | | | Merge branch 'prepend-grape-api-ce' into 'master'Rémy Coutable2018-03-061-21/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify lib/api/merge_requests.rb with EE See merge request gitlab-org/gitlab-ce!17539
| * | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rc/speedup-rake-jobs' into 'master'Robert Speicher2018-03-061-131/+113
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Speedup CI jobs See merge request gitlab-org/gitlab-ce!14911
| * | | | | | New .dedicated-no-docs-pull-cache-job and .no-db-job definitionsRémy Coutable2018-03-061-136/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should speed up a bit some jobs. Also, use ruby:2.4-alpine image in the flaky-examples-check job Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Add date calls in .gitlab-ci.yml to see how long each step takeRémy Coutable2018-03-061-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs-devguide-cherry-pick-ce-to-ee' into 'master'Achilleas Pipinellis2018-03-062-2/+140
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs guidelines: cherry-picking commits from CE to EE Closes #41338 and #28822 See merge request gitlab-org/gitlab-ce!17367
| * | | | | | | Docs guidelines: cherry-picking commits from CE to EEMarcia Ramos2018-03-062-2/+140
|/ / / / / / /
* | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-0630-370/+403
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring changes to support cluster metrics in EE Closes #42820 See merge request gitlab-org/gitlab-ce!17336
| * | | | | | 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
| * | | | | | Arg.id via method pointerPawel Chojnacki2018-03-061-1/+1
| | | | | | |
| * | | | | | one space too farPawel Chojnacki2018-03-051-1/+0
| | | | | | |
| * | | | | | Check if prometheus_adapter is properly calledPawel Chojnacki2018-03-053-32/+21
| | | | | | |
View Lorry Controller Status