Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-31Add changelog [skip ci]gitaly-version-v0.50.0Andrew Newdigate
2017-10-31Update Gitaly version to v0.50.0Andrew Newdigate
2017-10-30Merge branch '39582-nestingdepth-6' into 'master'Annabel Dunstone Gray
Enable NestingDepth (level 6) on scss-lint Closes #39582 See merge request gitlab-org/gitlab-ce!15073
2017-10-30Merge branch '39583-reopen-issue-count-cache' into 'master'Rémy Coutable
Refresh open Issue and Merge Request project counter caches when re-opening Closes #39583 See merge request gitlab-org/gitlab-ce!15085
2017-10-30Refresh open Issue and Merge Request project counter caches when re-openingRob Ede
2017-10-30Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'Rémy Coutable
Fix broken Members link when relative URL root paths are used See merge request gitlab-org/gitlab-ce!15070
2017-10-30Merge branch ↵Sean McGivern
'39570-performance-bar-appears-enabled-even-though-it-won-t-show-up' into 'master' Resolve "Performance bar appears enabled even though it won't show up" Closes #39570 See merge request gitlab-org/gitlab-ce!15084
2017-10-30Add .gitlab/route-map.ymlRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-30Allow to disable the Performance Bar and document the `p b` shortcut in its ↵Rémy Coutable
doc page Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-30Merge branch '38869-importer_status' into 'master'Phil Hughes
Remove code from global namespace See merge request gitlab-org/gitlab-ce!15058
2017-10-30Merge branch 'update-fe-i18n-guide' into 'master'Filipa Lacerda
Update i18n in FE docs for marking and interpolation See merge request gitlab-org/gitlab-ce!15020
2017-10-30Merge branch ↵Fatih Acet
'39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone' into 'master' Fix call stack size exceeded group milestone description autocomplete Closes #39020 See merge request gitlab-org/gitlab-ce!14972
2017-10-30Merge branch ↵Stan Hu
'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_data-39504' into 'master' Update Prometheus Gem to fix problem caused by using wrong data offsets See merge request gitlab-org/gitlab-ce!15081
2017-10-30Merge branch 'fix/project-select-js-without-button' into 'master'Filipa Lacerda
Changed project select to use it independently and not onlt as a combobutton See merge request gitlab-org/gitlab-ce!15043
2017-10-30Changed project select to use it independently and not onlt as a combobuttonFrancisco Javier López
2017-10-30Merge branch 'fix-500-on-old-merge-requests' into 'master'Douwe Maan
Fix 500 error for old (somewhat) MRs Closes #36540 See merge request gitlab-org/gitlab-ce!14945
2017-10-30Fix 500 error for old (somewhat) MRsAlexWayfer
2017-10-30Fix queried elementFilipa Lacerda
2017-10-30Update Prometheus Gem to fix problem caused by reading bad data.Pawel Chojnacki
2017-10-30Merge branch 'an/gitaly-v0.50.0' into 'master'Sean McGivern
Upgrade Gitaly to v0.50.0 See merge request gitlab-org/gitlab-ce!15050
2017-10-30Merge branch ↵Yorick Peterse
'39054-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::QueryCanceled: ERROR: canceling statement due to statement timeout" Closes #39054 See merge request gitlab-org/gitlab-ce!15063
2017-10-30Merge branch '39426-update-fog-google-docs' into 'master'Achilleas Pipinellis
Add docs for backing up to Google Cloud Storage See merge request gitlab-org/gitlab-ce!15074
2017-10-30Merge branch 'bvl-add-circuitbreaker-metrics-docs' into 'master'Achilleas Pipinellis
Add missing circuitbreaker metrics to prometheus documentation See merge request gitlab-org/gitlab-ce!15062
2017-10-30Split S3 and Google Cloud Storage sections in backup docAchilleas Pipinellis
2017-10-30Merge branch 'master' into 38869-importer_statusFilipa Lacerda
* master: (51 commits) Move locked check to a guard-clause Ci::Build tag is a trait instead of an own factory [CE backport] Saved configuration for issue board Use the correct project visibility in system hooks Add changelog more readable changelog Make merge_jid handling less stateful in MergeService Fetch the merged branches at once remove extra whitespace use a delegate for `username` to be more future friendly Merging EE doc into CE add changelog entry Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername ...
2017-10-30Merge branch 'zj-tag-trait-ci-build' into 'master'Grzegorz Bizon
Ci::Build tag is a trait instead of an own factory See merge request gitlab-org/gitlab-ce!15077
2017-10-30Merge branch 'make-merge-jid-handling-less-stateful' into 'master'Sean McGivern
Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
2017-10-30Move locked check to a guard-clauseOswaldo Ferreira
2017-10-30Ci::Build tag is a trait instead of an own factoryZeger-Jan van de Weg
Minor annoyance of mine, and there were a couple of things wrong, for example: 1. Switching on a property is just a trait 2. It didn't inherrit from its parent Find and replace through the code based fixed all occurances.
2017-10-30Merge branch '2518-saved-configuration-for-issue-board' into 'master'Phil Hughes
[CE backport] Saved configuration for issue board See merge request gitlab-org/gitlab-ce!15009
2017-10-30[CE backport] Saved configuration for issue boardOswaldo Ferreira
2017-10-30Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'Sean McGivern
Use the correct project visibility in system hooks Closes #39496 See merge request gitlab-org/gitlab-ce!15065
2017-10-30Merge branch '39366-email-confirmation-fails' into 'master'Douwe Maan
grab the correct username when confirming secondary email Closes #39366 See merge request gitlab-org/gitlab-ce!15010
2017-10-30Use the correct project visibility in system hooksBob Van Landuyt
2017-10-30Add docs for backing up to Google Cloud StorageLin Jen-Shin
2017-10-30Enable NestingDepth (level 6) on scss-lintTakuya Noguchi
2017-10-30Merge branch 'es-module-autosave' into 'master'Filipa Lacerda
Remove Autosave class from global namespace See merge request gitlab-org/gitlab-ce!14856
2017-10-29Add changelogOswaldo Ferreira
2017-10-28more readable changelogBrett Walker
2017-10-28Merge branch 'docs/update-create-mr' into 'master'Marcia Ramos
Update docs on creating MRs See merge request gitlab-org/gitlab-ce!14982
2017-10-28Fix broken Members link when relative URL root paths are usedStan Hu
Navigating to the "Members" section of a project would omit the relative URL root path. Fix the redirection and eliminate the need for a redirection in the first place. Fix other redirections failing to work with relative roots
2017-10-27Make merge_jid handling less stateful in MergeServiceOswaldo Ferreira
2017-10-27Merge branch 'use-git-branch-merged' into 'master'Rémy Coutable
Fetch the merged branches at once. Checking it one by one in the view. We don't cache this yet because this would already much improve the performance. A naive test against a particularly large repository: ``` ruby begin now = Time.now branches.map{ |b| r.merged_to_root_ref?(b.name) } Time.now - now end # 8.265830782 ``` Around 10 times faster: ``` ruby begin now = Time.now r.merged_branches(branches.map(&:name)) Time.now - now end # 0.807405397 ``` This should make the branches page usable. See merge request gitlab-org/gitlab-ce!14729
2017-10-27Fetch the merged branches at onceLin Jen-Shin (godfat)
2017-10-27remove extra whitespaceBrett Walker
2017-10-27Merge branch 'docs-update-ee_features.md-ce' into 'master'Rémy Coutable
Move doc/development/ee_features.md to CE See merge request gitlab-org/gitlab-ce!15066
2017-10-27use a delegate for `username` to be more future friendlyBrett Walker
2017-10-27Merging EE doc into CELin Jen-Shin
2017-10-27Merge branch 'zj-commit-cache' into 'master'Sean McGivern
Cache commits on the repository model See merge request gitlab-org/gitlab-ce!14863
2017-10-27Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'Sean McGivern
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug See merge request gitlab-org/gitlab-ce!15054