summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* make legend X-offset into a constantmultiple-query-prometheus-graphsMike Greiling2017-11-062-6/+8
|
* fix eslint max-lineMike Greiling2017-11-061-1/+2
|
* correctly set the domain of a result set when it is different on other tracksMike Greiling2017-11-062-11/+11
|
* add CHANGELOG.md entry for !15201Mike Greiling2017-11-061-0/+6
|
* simplify legend label for additonal tracksMike Greiling2017-11-061-1/+1
|
* fix karma failuresMike Greiling2017-11-064-4/+4
|
* add dashed and dotted line styles for multiple-query graphsMike Greiling2017-11-064-10/+31
|
* add track information to data legendMike Greiling2017-11-061-3/+7
|
* process all queries within a graphMike Greiling2017-11-061-16/+24
|
* pass all graph queries into createTimeSeriesMike Greiling2017-11-062-2/+3
|
* fix bug in which axes are scaled only to first data setMike Greiling2017-11-061-2/+3
|
* Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'Sean McGivern2017-11-0621-97/+51
|\ | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129
| * updated the ignore_column concern to support multiple columnsmicael.bergeron2017-11-062-6/+10
| | | | | | | | | | This method is an ActiveRecord extension and it should behave like one. I expected this to work.
| * align with the commentsmicael.bergeron2017-11-062-4/+1
| |
| * ignore the column before the migrationmicael.bergeron2017-11-065-8/+5
| | | | | | | | | | reword the changelog remove dead code in the specs
| * fix the failing specremove-ensure-ref-fetched-from-controllersmicael.bergeron2017-11-032-2/+0
| |
| * make the migration reversiblemicael.bergeron2017-11-032-2/+2
| |
| * add changelog and move migration to post_migratemicael.bergeron2017-11-032-0/+5
| |
| * removed the #ensure_ref_fetched from all controllersmicael.bergeron2017-11-0313-80/+33
| | | | | | | | | | | | | | | | also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch!
* | Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-069-196/+101
|\ \ | | | | | | | | | | | | | | | | | | Revert unintentional changes in !12810 Closes #39816 See merge request gitlab-org/gitlab-ce!15198
| * | Revert unintentional changes in !12810Takuya Noguchi2017-11-069-196/+101
| | |
* | | Merge branch ↵Sean McGivern2017-11-063-8/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'pawel/show_empty_page_when_prometheus_metrics_are_disabled-35639' into 'master' Make Prometheus metrics endpoint return empty response when metrics are disabled Closes #35639 See merge request gitlab-org/gitlab-ce!14490
| * | | Add ChangelogPawel Chojnacki2017-11-061-0/+5
| | | |
| * | | Make Prometheus metrics endpoint return empty response when metrics are disabledpawel/show_empty_page_when_prometheus_metrics_are_disabled-35639Pawel Chojnacki2017-09-252-8/+11
| | | |
* | | | Merge branch '27375-dashboard-activity-performance' into 'master'Douwe Maan2017-11-0636-225/+429
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "DashboardController#activity.json is slow due to SQL" Closes #27375 See merge request gitlab-org/gitlab-ce!14985
| * | | | Resolve "DashboardController#activity.json is slow due to SQL"Francisco Javier López2017-11-0636-225/+429
|/ / / /
* | | | Merge branch 'add-reconfigure-logs' into 'master'Stan Hu2017-11-061-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add reconfigure docs to CE See merge request gitlab-org/gitlab-ce!15224
| * | | | Add reconfigure docs to CEStan Hu2017-11-061-0/+9
| | | | |
* | | | | Merge branch 'jej/fs-prevent-push-when-missing-objects' into 'master'Douwe Maan2017-11-064-17/+101
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent git push when LFS objects are missing Closes #24564 See merge request gitlab-org/gitlab-ce!13837
| * | | | | Replaced subject with subject.exec in ↵James Edwards-Jones2017-11-061-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | spec/lib/gitlab/checks/change_access_spec.rb
| * | | | | Prevent git push when LFS objects are missingJames Edwards-Jones2017-11-064-3/+93
| | | | | |
* | | | | | Merge branch 'dm-block-group-and-project-creation-when-external-by-default' ↵Sean McGivern2017-11-063-5/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Make sure group and project creation is blocked for new users that are external by default Closes #39664 See merge request gitlab-org/gitlab-ce!15212
| * | | | | | Make sure group and project creation is blocked for new users that are ↵Douwe Maan2017-11-063-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | external by default
* | | | | | | Merge branch '39668-tooltip-safari' into 'master'Tim Zallmann2017-11-062-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove native title tooltip in pipeline jobs dropdown in Safari Closes #39668 See merge request gitlab-org/gitlab-ce!15213
| * | | | | | | Remove native title tooltip in pipeline jobs dropdown in Safari39668-tooltip-safariFilipa Lacerda2017-11-062-0/+10
| | | | | | | |
* | | | | | | | Merge branch 'winh-skip-parsePikadayDate-test' into 'master'Filipa Lacerda2017-11-061-4/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily remove parsePikadayDate test Closes #39834 See merge request gitlab-org/gitlab-ce!15217
| * | | | | | | | Remove parsePikadayDate testwinh-skip-parsePikadayDate-testWinnie Hellmann2017-11-061-4/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'Sean McGivern2017-11-0618-159/+223
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reallow project paths ending in periods Closes #39695 See merge request gitlab-org/gitlab-ce!15190
| * | | | | | | | Reallow project paths ending in periodsdm-reallow-project-path-ending-in-periodDouwe Maan2017-11-0618-159/+223
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '38247-hide-create-mr-button-in-issue-show' into 'master'Rémy Coutable2017-11-063-11/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove create MR button from issues when MRs are disabled Closes #38247 See merge request gitlab-org/gitlab-ce!15071
| * | | | | | | | Remove create MR button from issues when MRs are disabledGeorge Andrinopoulos2017-11-063-11/+34
|/ / / / / / / /
* | | | | | | | Merge branch 'winh-use-vue-warnhandler' into 'master'Phil Hughes2017-11-061-18/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Vue warnhandler Closes #33849 See merge request gitlab-org/gitlab-ce!15152
| * | | | | | | | Use Vue warnhandlerwinh-use-vue-warnhandlerWinnie Hellmann2017-11-061-18/+22
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk-delete-epic-backport' into 'master'Sean McGivern2017-11-066-37/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor issuable destroy action See merge request gitlab-org/gitlab-ce!15203
| * | | | | | | | Refactor issuable destroy actionJarka Kadlecova2017-11-066-37/+24
| | | | | | | | |
* | | | | | | | | Merge branch ↵Sean McGivern2017-11-061-7/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-job' into 'master' Resolve "Use the `--parallel` Rubocop option in the static-analysis CI job" Closes #39790 See merge request gitlab-org/gitlab-ce!15183
| * | | | | | | | | Use the --parallel Rubocop flag in the static-analysis and improve the job39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-jobRémy Coutable2017-11-031-7/+16
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'ignore-legacy-routes-in-routing-spec' into 'master'Douwe Maan2017-11-061-3/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore routes matching legacy_*_redirect in route specs See merge request gitlab-org/gitlab-ce!15208
| * | | | | | | | | Ignore routes matching legacy_*_redirect in route specsSean McGivern2017-11-061-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Routes with the name `legacy_*_redirect` may have wildcards deliberately, in order to support routing old paths to new paths. As long as these routes are tested independently, they do not need to fail the path regex spec.
* | | | | | | | | | Merge branch '38597-editor-icons' into 'master'Phil Hughes2017-11-0615-37/+58
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Editor icons" Closes #38597 See merge request gitlab-org/gitlab-ce!15169