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
2019-02-12Correctly align resolved discussion textMark Florian
The header of the `NoteableDiscussion` component is really a media object[1], but it didn't have the right DOM or styling to correctly achieve it. This change wraps all the children of the media object (except the floated image) in a dedicated `.timeline-content` element, which is styled to establish its own block formatting context[2]. This ensures *all* of its children sit left-aligned to the right edge of the float. In short, the DOM used to look like this: .discussion-header .timeline-icon note-header note-edited-text and now it looks like this: .discussion-header .timeline-icon .timeline-content (with own formatting context) note-header note-edited-text This is also now more consistent with the DOM of `NoteableNote`, in that `.timeline-icon` and `.timeline-content` seem to want to be siblings. [1]: http://www.stubbornella.org/content/2010/06/25/the-media-object-saves-hundreds-of-lines-of-code/ [2]: https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
2019-02-12Merge branch 'sh-terminate-pg-connections-on-setup' into 'master'Rémy Coutable
Kill all PostgreSQL connections for rake dev:setup Closes gitlab-development-kit#450 See merge request gitlab-org/gitlab-ce!24743
2019-02-12Merge branch '47150-update-sshkey' into 'master'Rémy Coutable
Update sshkey to v2.0.0 Closes #47150 See merge request gitlab-org/gitlab-ce!25115
2019-02-12Merge branch 'qa-nightly-72-stablize-select-kind' into 'master'Dan Davison
Stablize select_kind using retry_on_exception Closes gitlab-org/quality/nightly#72 See merge request gitlab-org/gitlab-ce!25027
2019-02-12Merge branch 'add-client-for-count-diverging-commits' into 'master'Grzegorz Bizon
add client support for CountDivergingCommits rpc See merge request gitlab-org/gitlab-ce!24287
2019-02-12Add back the :quarantine tagSanad Liaquat
2019-02-12Move terminate_all_connections into setup Rake taskStan Hu
2019-02-12Kill all PostgreSQL connections for rake dev:setupStan Hu
If there are any clients connected to the DB, PostgreSQL won't let you drop the database. It's possible that Sidekiq, Unicorn, or some other client will be hanging onto a connection, preventing the DROP DATABASE from working. To workaround this problem, this method cancels all the connections so that the db:reset command will work. Note that there's still a slight possibility a client connects after its connection is terminated. If this is an issue, we could solve it by revoking CONNECT access, but for now it seems this works. Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/450
2019-02-12Merge branch 'jc-add-has-repository' into 'master'Douglas Barbosa Alexandre
Adding convenience method to project model See merge request gitlab-org/gitlab-ce!25108
2019-02-12Merge branch ↵Evan Read
'57287-documentation-for-handling-more-complex-only-merge_requests-scenarios-is-sparse' into 'master' Docs for MR pipeline rule interactions Closes #57287 See merge request gitlab-org/gitlab-ce!24929
2019-02-12Small grammar fixEvan Read
2019-02-12Merge branch 'fix-security-harness-script' into 'master'Robert Speicher
Fix security harness script See merge request gitlab-org/gitlab-ce!25050
2019-02-12Merge branch 'bw-review-feedback-task-list-toggle-service' into 'master'Robert Speicher
Address review comment for app/services/task_list_toggle_service.rb Closes #57413 See merge request gitlab-org/gitlab-ce!25013
2019-02-11Adding convenience method to project modelJohn Cai
2019-02-11Update sshkey to v2.0.0Nick Thomas
This release fixes a bug in handling certain ed25519 keys. For more details, see this GitHub issue: https://github.com/bensie/sshkey/issues/34
2019-02-11Adapt that diverging commits could be just one barLin Jen-Shin
refactors the ui for diverging commits so that it's only a single bar instead of two separate bars
2019-02-11Merge branch 'bvl-port-translations-from-ee' into 'master'Rémy Coutable
Port of EE translations See merge request gitlab-org/gitlab-ce!25100
2019-02-11Add HTML output example to profilingDrew Blessing
2019-02-11Merge branch 'docs-profile-html-output-example' into 'master'Marcia Ramos
Add HTML output example to profiling See merge request gitlab-org/gitlab-ce!25103
2019-02-11Merge branch 'docs/pages-compress' into 'master'Marcia Ramos
Change find flags to also work with Alpine Closes #57341 See merge request gitlab-org/gitlab-ce!25104
2019-02-11Change find flags to also work with AlpineAchilleas Pipinellis
2019-02-11Merge branch '57450-follow-up-from-api-group-labels' into 'master'Achilleas Pipinellis
Resolve "Follow-up from "API group labels"" Closes #57450 See merge request gitlab-org/gitlab-ce!25070
2019-02-11Merge branch 'docs/refactor-update-guides' into 'master'Marin Jankovski
Refactor the upgrading from source docs Closes gitlab-org/release/framework#190 See merge request gitlab-org/gitlab-ce!25003
2019-02-11Merge branch 'docs-abuango-registry-selfsigned-certs' into 'master'Tom Atkins
Update on using self-signed certs with registry See merge request gitlab-org/gitlab-ce!25086
2019-02-11Update container_registry.md add Troubleshooting sectionsTom Atkins
2019-02-11Merge branch 'docs-57480-fix-branch-api-table-format' into 'master'Achilleas Pipinellis
Fix branch API table format Closes #57480 See merge request gitlab-org/gitlab-ce!25091
2019-02-11Use a single document for upgrading from CE to EEYorick Peterse
This changes the guides for upgrading from CE source to EE source so we no longer need separate documents for every version. This removes the need for release managers to create and update these documents, and allows developers to add these instructions as part of their code changes.
2019-02-11Merge branch 'master-i18n' into 'master'Rémy Coutable
New Crowdin translations See merge request gitlab-org/gitlab-ee!9510
2019-02-11Merge branch '52424-goodbye-hipchat' into 'master'Douglas Barbosa Alexandre
Remove HipChat integration from GitLab Closes #52424 See merge request gitlab-org/gitlab-ce!22223
2019-02-11Refactor the upgrading from source docsYorick Peterse
Instead of requiring one separate document for every version (which is created by release managers), we now use a single document for both Community Edition and Enterprise Edition. This allows developers to add guidelines right away, instead of release managers having to determine what to add. Version specific upgrading instructions are placed in a separate section. This prevents instructions from lingering around for many versions should a developer forget to remove them. This also ensures that all instructions are kept in a single place, instead of being spread across different documents. A minor downside is that CE and EE guidelines now live in the same document, which could cause merge conflicts. Since we are working towards a single codebase, this should only be an issue until we merge the codebases together; something we expect to do in the coming months. This commit also removes all old upgrading instructions, but these can still be accessed using Git branch specific URLs (included in the updating README).
2019-02-11Fix branch API table formatMark Fletcher
2019-02-11Merge branch 'fix_deployment_service_predefined_variables' into 'master'Nick Thomas
Add missing argument to DeploymentService#predefined_variables See merge request gitlab-org/gitlab-ce!24989
2019-02-11Merge branch 'deprecated-migration-inheritance' into 'master'Rémy Coutable
Directly inheriting from ActiveRecord::Migration is deprecated See merge request gitlab-org/gitlab-ce!25066
2019-02-11Merge branch 'patch-22' into 'master'Rémy Coutable
use timeout as it appears in logs See merge request gitlab-org/gitlab-ce!21264
2019-02-11use timeout as it appears in logsBen Bodenmiller
2019-02-11Merge branch '55447-validate-k8s-ca-cert' into 'master'Dmitriy Zaporozhets
Validate k8s CA certificate at cluster creation See merge request gitlab-org/gitlab-ce!24990
2019-02-11Merge branch '57431-sprockets-caches-files-independent-of-content' into 'master'Lin Jen-Shin
Use correct integrity hash for sprockets caching Closes #57431 See merge request gitlab-org/gitlab-ce!25033
2019-02-11Update on using self-signed certs with registryAbubakar Siddiq Ango
2019-02-11Merge branch 'qa-improve-wait-for-push' into 'master'Ramya Authappan
[CE] Improve `wait_for_push` Closes #53308 See merge request gitlab-org/gitlab-ce!24085
2019-02-11[CE] Improve `wait_for_push`Mark Lapierre
2019-02-11Merge branch 'an-peek-jaeger' into 'master'Grzegorz Bizon
Provide a performance bar link to the Jaeger UI See merge request gitlab-org/gitlab-ce!24902
2019-02-11Merge branch 'i18n-externalize-date-picker-string' into 'master'Phil Hughes
Externalize date picker string See merge request gitlab-org/gitlab-ce!25068
2019-02-11Apply suggestion to doc/ci/merge_request_pipelines/index.mdJason Lenny
2019-02-11Apply suggestion to doc/ci/merge_request_pipelines/index.mdJason Lenny
2019-02-11Merge branch 'docs-correct-word' into 'master'Evan Read
Docs: correct word See merge request gitlab-org/gitlab-ce!25065
2019-02-11Merge branch 'qa-staging-32-fix-create-project-spec' into 'master'Ramya Authappan
Fix create_project_spec Closes gitlab-org/quality/staging#32 See merge request gitlab-org/gitlab-ce!25029
2019-02-11Merge branch 'removes-milestone-from-cluster-base-domain-docs' into 'master'Evan Read
Removes milestone from cluster base domain documentation See merge request gitlab-org/gitlab-ce!25045
2019-02-10Improve group labels API docsRobert Schilling
2019-02-10Merge branch 'pl-copy-still-active' into 'master'Stan Hu
Fix error when reloading code in Sidekiq Closes #54320 See merge request gitlab-org/gitlab-ce!25069
2019-02-10Fix error when reloading code in SidekiqPeter Leitzen
This commit fixes the following error in development: ArgumentError: A copy of Gitlab::Metrics::Transaction has been removed from the module tree but is still active!