Commit d39bfecb authored by Lauren Barker's avatar Lauren Barker
Browse files

split posts into correct blog directories, update blog include logic to pull from both blogs

parent 8a666d57
Pipeline #105658171 failed with stages
in 9 minutes and 38 seconds
---
title: "Resolving Merge Conflicts from the GitLab UI"
author: Sean McGivern
author_gitlab: smcgivern
author_twitter: mcgivernsa
categories: company
image_title: '/images/blogimages/resolving-merge-conflicts-from-the-gitlab-ui/merge-conflicts.png'
twitter_image: '/images/tweets/resolving-merge-conflicts-from-the-gitlab-ui.png'
......
......@@ -81,7 +81,7 @@ Interestingly, this was true regardless of whether they were in our department a
 
{: .text-center}
![GitLab Edinburgh](/images/blogimages/gitlab-edinburgh.jpg){: .shadow}<br>
_The unofficial Edinburgh GitLab office, with (from left to right) Douwe, [James EJ](/company/team/#jamedjo), [Sean M](/company/team/#smcgivern), [Sean P](/company/team/#SeanPackham), [Nick](/company/team/#lupine_85), and Robert_
_The unofficial Edinburgh GitLab office, with (from left to right) Douwe, [James EJ](/company/team/#jamedjo), [Sean M](/company/team/#mcgivernsa), [Sean P](/company/team/#SeanPackham), [Nick](/company/team/#lupine_85), and Robert_
 
## Insight 2: Hearing about it is one thing, experiencing it is another
 
......
......@@ -453,7 +453,7 @@ This post is one in a series about this particular trip. Check out
[Pedro]: /team/#pedromscom
[Rémy]: /team/#rymai
[Robert]: /team/#rspeicher
[Sean M.]: /team/#smcgivern
[Sean M.]: /team/#mcgivernsa
[Sean P.]: /team/#SeanPackham
[Tiago]: /team/#tiagobotelho9
[Tomasz]: /team/#TomaszMaczukin
......
......@@ -37,7 +37,7 @@ gets to a user. Because of our monthly release cycle, users could be stuck with
a broken feature until the following month, causing frustration and decreasing
the value that GitLab brings to its users. So, it’s important that we test and
ship with certainty. [Marin Jankovski](/company/team/#maxlazio), Engineering Manager of
the Distribution & Release Management teams, and [Sean McGivern](/company/team/#smcgivern),
the Distribution & Release Management teams, and [Sean McGivern](/company/team/#mcgivernsa),
Engineering Manager of the Plan team, note the importance of testing and shipping features.
 
 
......
......@@ -85,7 +85,7 @@ _In part four of our series we have advice on everything from time management to
[mikegreiling]: /company/team/#mikegreiling
[nolith]: /company/team/#nolith
[Ravlen]: /company/team/#ravlen1
[smcgivern]: /company/team/#smcgivern
[smcgivern]: /company/team/#mcgivernsa
 
Photo by [Baby Natur](https://unsplash.com/@babynatur?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText) on [Unsplash](https://unsplash.com/search/photos/kids-toys?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText)
{: .note}
......@@ -131,4 +131,4 @@ Photo by [Baby Natur](https://unsplash.com/@babynatur?utm_source=unsplash&utm_me
[kxkue]: /company/team/#karliakue
[lyle]: /company/team/#lkozloff
[mbergeron]: /company/team/#micaelbergeron
[smcgivern]: /company/team/#smcgivern
[smcgivern]: /company/team/#mcgivernsa
---
release_number: "12.6"
title: "GitLab 12.6 released with Security Scorecard and Release Evidence"
author: Gabe Weaver
author_gitlab: gweaver
author_twitter: gabeweaver
image_title: '/images/12_6/12_6-cover-image.jpg'
description: "GitLab 12.6 released with Security Scorecard, Release Evidence, Conan C/C++ repository, and much more!"
twitter_image: '/images/tweets/gitlab-12-6-released.png'
categories: releases
layout: release
featured: yes
header_layout_dark: true
# release_number_dark: true #uncomment if you want a dark release number
---
A common challenge many development leaders face is having visibility into the overall [application security](/solutions/dev-sec-ops/) and [compliance](/solutions/compliance/) status of their projects. This month's GitLab release helps you more efficiently monitor the application security and release compliance of your projects.
## **Security Visibility with Project Security Status**
{:.intro-header}
With GitLab 12.6, a new [Project Security Status panel](#quickly-understand-your-at-risk-projects-with-project-security-grades) shows how projects are ranked according to their security profile. This makes it easier for development leaders to quickly understand which projects may have greater risk and therefore might warrant additional attention to address specific issues.
### **Streamline Audits with Release Evidence**
{:.intro-header-h3}
Almost every enterprise development team is expected to document and demonstrate that each release complies with their organization’s policies, procedures, and controls. Often it means they have a manual processes to save the documentation so that future audits can review the compliance evidence. GitLab 12.6 makes audits and compliance much easier, with a [release evidence file](#automated-release-evidence-collection-to-support-audits) in the form of a JSON object that includes links to the milestones and issues that were included in the release, which can help to streamline future audits.
### **Efficiently Manage and Share C/C++ Resources**
{:.intro-header-h3}
Many teams are actively developing new high performance applications in C and C++ and they need the ability to easily store and manage the compiled files and binaries from their projects. GitLab 12.6 now helps teams writing code in C and C++ to manage and share both privately and publicly the binaries from their projects with the popular [Conan repository built into GitLab](#manage-cc-packages-via-conan-within-gitlabs-package-registry). They can now benefit from having source code, automated GitLab CI pipelines and the resulting packages in the same application which will help improve their overall efficiency and velocity.
### **And Much More**
{:.intro-header-h3}
These are just a few of the highlights in 12.6. Check out the other great updates, such as [dependency scanning for Java Gradle projects](#dependency-scanning-for-java-gradle-projects) and [support for squash-and-merge within Merge Trains](#maintain-a-consolidated-commit-history-with-squash-and-merge-in-merge-trains).
Also, [registration is open](https://www.eventbrite.com/e/gitlab-commit-2020-san-francisco-tickets-73836706577) for the next [GitLab Commit User Conference](https://www.eventbrite.com/e/gitlab-commit-2020-san-francisco-tickets-73836706577) in San Francisco, January 14.
......@@ -8,9 +8,16 @@ extra_css:
extra_js:
- blog-home.js
---
// Create list of featured articles uisng both blogs
- featured_blog_articles = blog('blog').articles.keep_if{ |a| a.data.featured}[0...2]
- featured_release_articles = blog('releases').articles.keep_if{ |a| a.data.featured}[0...2]
- featured_articles = [ featured_blog_articles[0..2], featured_release_articles[0..2] ].flatten.compact.sort_by(&:date).reverse
// Create list of non-featured articles uisng both blogs
- non_featured_blog_articles = blog('blog').articles.delete_if{ |a| featured_articles.include?(a) || a.data.categories.include?("unfiltered")}
- releases = blog('releases').articles
- non_featured_articles = [ releases[0..12], non_featured_blog_articles[0..12] ].flatten.compact.sort_by(&:date).reverse
 
- featured_articles = blog.articles.keep_if{ |a| a.data.featured}[0...2]
- non_featured_articles = blog.articles.delete_if{ |a| featured_articles.include?(a) || a.data.categories.include?("unfiltered")}
.blog.list
.wrapper
.section
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment