summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable rubocop for db/**/* and ee/db/**/*49582-enable-cops-for-dbLin Jen-Shin2018-07-25167-157/+55
|
* Merge branch 'osw-49554-broken-master' into 'master'Rémy Coutable2018-07-242-2/+2
|\ | | | | | | | | Add :sidekiq group to cleanup redis in after callback See merge request gitlab-org/gitlab-ce!20816
| * Add :sidekiq group to cleanup redis in after callbackOswaldo Ferreira2018-07-242-2/+2
|/
* Merge branch 'dz-refactor-object-store-settings' into 'master'Rémy Coutable2018-07-243-23/+48
|\ | | | | | | | | Create class responsible for default object store settings See merge request gitlab-org/gitlab-ce!20785
| * Make ObjectStoreSettings use more explicit and add specsdz-refactor-object-store-settingsDmitriy Zaporozhets2018-07-243-7/+37
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Create class responsible for default object store settingsDmitriy Zaporozhets2018-07-232-24/+19
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'zj-backup-timeout' into 'master'Rémy Coutable2018-07-243-4/+13
|\ \ | | | | | | | | | | | | Remove timeouts for long running requests See merge request gitlab-org/gitlab-ce!20810
| * | Remove timeouts for long running requestsZeger-Jan van de Weg2018-07-243-4/+13
| | |
* | | Merge branch 'frozen-string-danger' into 'master'Rémy Coutable2018-07-244-3/+35
|\ \ \ | | | | | | | | | | | | | | | | Check Frozen String Literal in Danger See merge request gitlab-org/gitlab-ce!20767
| * | | Add Dangerfile for frozen_string_literalgfyoung2018-07-244-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks that new Ruby files will enable frozen string literal. Partially addresses #47424.
* | | | Merge branch 'jxterry-private-profile' into 'master'Douwe Maan2018-07-2422-66/+312
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add an option to have a private profile on GitLab See merge request gitlab-org/gitlab-ce!20387
| * | | | Add an option to have a private profile on GitLabJX Terry2018-07-2422-66/+312
|/ / / /
* | | | Merge branch 'zj-repo-cleanup-mandatory' into 'master'Douwe Maan2018-07-241-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make repository cleanup mandatory Closes #49550 See merge request gitlab-org/gitlab-ce!20808
| * | | | Make repository cleanup mandatoryZeger-Jan van de Weg2018-07-241-4/+2
| | |/ / | |/| |
* | | | Merge branch 'update-improve-issue-boards-links-to-docs' into 'master'Achilleas Pipinellis2018-07-241-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update improve issue boards links to docs [ci skip] See merge request gitlab-org/gitlab-ce!20803
| * | | | Update improve issue boards links to docs [ci skip]George Tsiolis2018-07-241-2/+2
| | |/ / | |/| |
* | | | Merge branch '43011-typecast-markdownversion-prop-notesapp' into 'master'Phil Hughes2018-07-242-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Vue datatype errors for markdownVersion parsing See merge request gitlab-org/gitlab-ce!20800
| * | | | Add changelog entry43011-typecast-markdownversion-prop-notesappKushal Pandya2018-07-241-0/+5
| | | | |
| * | | | Use `parseInt` to convert markdownVersion into numberKushal Pandya2018-07-241-1/+1
| | | | |
* | | | | Merge branch 'kp-stacked-progress-bar-decimal-places' into 'master'Phil Hughes2018-07-246-7/+56
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Show decimal place up to single digit in Stacked Progress Bar Closes gitlab-ee#6028 See merge request gitlab-org/gitlab-ce!20776
| * | | | Add changelog entrykp-stacked-progress-bar-decimal-placesKushal Pandya2018-07-241-0/+5
| | | | |
| * | | | Use `roundOffFloat` method to show decimal places in progressbarKushal Pandya2018-07-243-7/+12
| | | | |
| * | | | Add `roundOffFloat` helper methodKushal Pandya2018-07-242-0/+39
| |/ / /
* | | | Merge branch 'docs-add-read_repository-description' into 'master'Achilleas Pipinellis2018-07-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | adds read_repository scope description See merge request gitlab-org/gitlab-ce!20707
| * | | | adds read_repository scope descriptiondocs-add-read_repository-descriptionAlexander Tanayno2018-07-191-0/+1
| | | | |
* | | | | Merge branch 'sh-bump-sanitize-4.6.6' into 'master'Rémy Coutable2018-07-244-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance See merge request gitlab-org/gitlab-ce!20795
| * | | | | Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performancesh-bump-sanitize-4.6.6Stan Hu2018-07-234-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183 nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771
* | | | | | Merge branch 'frozen-string-enable-app-serializers' into 'master'Rémy Coutable2018-07-24100-8/+216
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Enable frozen string in app/serializers/**/*.rb See merge request gitlab-org/gitlab-ce!20726
| * | | | | Enable frozen string in app/serializers/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-serializersgfyoung2018-07-23100-8/+216
| | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424.
* | | | | | Merge branch 'feature/add-docs-to-disable-listener' into 'master'Achilleas Pipinellis2018-07-241-23/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to disable proxy listener See merge request gitlab-org/gitlab-ce!19734
| * | | | | | Add docs to disable proxy listenermaxmeyer2018-07-241-23/+21
|/ / / / / /
* | | | | | Merge branch 'revert-aeb3df17' into 'master'Achilleas Pipinellis2018-07-241-38/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'" See merge request gitlab-org/gitlab-ce!20633
| * | | | | | Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'"revert-aeb3df17Steve Azzopardi2018-07-161-38/+0
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !19664
* | | | | | | Merge branch 'docs-no-milestone-issues-api' into 'master'Sean McGivern2018-07-241-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In docs, add `No+Milestone` for querying by milestone See merge request gitlab-org/gitlab-ce!20784
| * | | | | | | Add `No+Milestone` for querying by milestonedocs-no-milestone-issues-apiVictor Wu2018-07-231-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'gitaly-remove-fetch-ref' into 'master'Sean McGivern2018-07-242-0/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Annotate Gitlab::Git::Repository#fetch_ref See merge request gitlab-org/gitlab-ce!20742
| * | | | | | Annotate Gitlab::Git::Repository#fetch_refJacob Vosmaer (GitLab)2018-07-242-0/+5
|/ / / / / /
* | | | | | Merge branch 'api-minimal-access-level' into 'master'Robert Speicher2018-07-2313-13/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add filter for minimal access level in groups and projects API Closes #48165 See merge request gitlab-org/gitlab-ce!20478
| * | | | | | Add changelog entry for api-minimal-access-levelMarko, Peter2018-07-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marko, Peter <peter.marko@siemens.com>
| * | | | | | Add min_access_level filter to projects APIMarko, Peter2018-07-238-8/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marko, Peter <peter.marko@siemens.com>
| * | | | | | Add min_access_level filter to groups APIMarko, Peter2018-07-234-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marko, Peter <peter.marko@siemens.com>
* | | | | | | Merge branch 'tz-mr-refactor-mem-posting' into 'master'Fatih Acet2018-07-234-31/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improving performance of posting a comment by reducing memory + CPU See merge request gitlab-org/gitlab-ce!20779
| * | | | | | | Improving performance of posting a comment by reducing memory + CPUTim Zallmann2018-07-234-31/+18
|/ / / / / / /
* | | | | | | Merge branch ↵Robert Speicher2018-07-231-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6977-follow-up-from-ee-resolve-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master' Use render instead of render_if_exists in app/views/projects/services/prometheus/_show.html.haml Closes gitlab-ee#6977 See merge request gitlab-org/gitlab-ce!20783
| * | | | | | Use render instead of render_if_exists in ↵6977-follow-up-from-ee-resolve-extract-ee-specific-files-lines-for-some-platform-related-project-viewsRémy Coutable2018-07-231-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | app/views/projects/services/prometheus/_show.html.haml Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'sh-remove-rouge-redcarpet-instrumentation' into 'master'Lin Jen-Shin2018-07-231-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove instrumentation for Rouge::Plugins::{Redcarpet,CommonMark} See merge request gitlab-org/gitlab-ce!20791
| * | | | | | Remove instrumentation Rouge::Plugins::{Redcarpet,CommonMark}Stan Hu2018-07-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The removal in 4d376c667d72e0eca22b4abe76e0bf09434fc4bd had an unintended side effect in that it got rid of the `require 'rouge/plugins/redcarpet'`.
* | | | | | | Merge branch 'sh-enable-frozen-literals-banzi-filters' into 'master'Rémy Coutable2018-07-235-3/+28
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Enable frozen strings in remaining lib/banzai/filter/*.rb files See merge request gitlab-org/gitlab-ce!20777
| * | | | | | Enable frozen strings in remaining lib/banzai/filter/*.rb filessh-enable-frozen-literals-banzi-filtersStan Hu2018-07-235-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes a bug with the ImageLazyLoadFilter not doing the right thing when an existing class attribute is present. Part of #47424
* | | | | | | Merge branch '45318-vuex-store' into 'master'Phil Hughes2018-07-238-0/+375
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Adds Vuex store to handle the data for tests reports in MR widget See merge request gitlab-org/gitlab-ce!20709
View Lorry Controller Status