Skip to content
Snippets Groups Projects
Commit 5c6ad9bd authored by Sabba Petri's avatar Sabba Petri
Browse files

Fixed conflicts

parent 612c7fea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
source/_includes/default_head.html
+ 0
− 4
View file @ 5c6ad9bd
@@ -84,11 +84,7 @@
<li><a href="/gitlab-ci" onClick="_gaq.push(['_trackEvent', 'Top navigation', 'GitLab CI']);">GitLab CI</a></li>
<li><a href="/community" onClick="_gaq.push(['_trackEvent', 'Top navigation', 'Community']);">Community</a></li>
<li><a href="/blog" onClick="_gaq.push(['_trackEvent', 'Top navigation', 'Blog']);">Blog</a></li>
<<<<<<< HEAD
<li><a href="https://gitlab.com/users/sign_in" onClick="_gaq.push(['_trackEvent', 'Top navigation', 'Sign in']);" class="sign-in-up-btn">Sign in</a></li>
=======
<li><a href="https://gitlab.com/users/sign_in" class="btn-sign" onClick="_gaq.push(['_trackEvent', 'Top navigation', 'Sign in']);">Sign in</a></li>
>>>>>>> hi/new_landing_page
</ul>
</div>
</div>
source/_includes/footer.html
+ 0
− 44
View file @ 5c6ad9bd
<div id="footer" class="footer">
<<<<<<< HEAD
<div class="container">
<div class="row">
<div class="col-sm-3 col-md-3">
<h3>Products</h3>
<ul class="animated">
<li><a href="/features/">Community Edition</a></li>
<li><a href="/features/#enterprise">Enterprise Edition</a></li>
<li><a href="/gitlab-ci/">Continuous Integration</a></li>
<li><a href="/pricing/#gitlab-com">GitLab.com</a></li>
</ul>
</div>
<div class="col-sm-3 col-md-3">
<h3>Services</h3>
<ul class="animated">
<li><a href="/pricing/">Pricing</a></li>
<li><a href="/consultancy/">Consultancy</a></li>
<li><a href="/development/">Development</a></li>
<li><a href="/training/">Training</a></li>
</ul>
</div>
<div class="col-sm-3 col-md-3">
<h3>Community</h3>
<ul class="animated">
<li><a href="/core-team/">Core Team</a></li>
<li><a href="/documentation/">Documentation</a></li>
<li><a href="/getting-help/">Getting Help</a></li>
<li><a href="/contributing/">Contributing</a></li>
</ul>
</div>
<div class="col-sm-3 col-md-3">
<h3>Company</h3>
<ul class="animated">
<li><a href="/blog/">Blog</a></li>
<li><a href="/press/">Press</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/team/">Team</a></li>
<li><a href="/jobs/">Jobs</a></li>
<li><a href="/terms/">Terms</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>
</div>
=======
<div class="container">
<div class="row">
<div class="col-sm-3 col-md-3">
@@ -87,6 +44,5 @@
</div>
<div class="row text-center copy">
<p>© Copyright GitLab</p>
>>>>>>> hi/new_landing_page
</div>
</div>
source/downloads/index.html
+ 0
− 40
View file @ 5c6ad9bd
@@ -8,17 +8,6 @@ extra_js:
platforms:
- name: ubuntu1204
long_name: Ubuntu 12.04
<<<<<<< HEAD
download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-12.04/gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb
install_commands: |
sudo dpkg -i gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb
dependency_commands: |
sudo apt-get install openssh-server
sudo apt-get install postfix
- name: ubuntu1404
long_name: Ubuntu 14.04
download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb
=======
download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-12.04/gitlab_7.6.2-omnibus.5.3.0.ci.1-1_amd64.deb
install_commands: |
sudo apt-get install openssh-server
@@ -27,40 +16,24 @@ platforms:
- name: ubuntu1404
long_name: Ubuntu 14.04
download_command: wget https://downloads-packages.s3.amazonaws.com/ubuntu-14.04/gitlab_7.6.2-omnibus.5.3.0.ci.1-1_amd64.deb
>>>>>>> hi/new_landing_page
install_commands: |
sudo dpkg -i gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb
dependency_commands: |
sudo apt-get install openssh-server
<<<<<<< HEAD
sudo apt-get install postfix
- name: debian7
long_name: Debian 7
download_command: wget https://downloads-packages.s3.amazonaws.com/debian-7.8/gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb
=======
sudo apt-get install postfix # Select 'Internet Site', using sendmail instead also works, exim has problems
sudo dpkg -i gitlab_7.6.2-omnibus.5.3.0.ci.1-1_amd64.deb
- name: debian7
long_name: Debian 7
download_command: wget https://downloads-packages.s3.amazonaws.com/debian-7.7/gitlab_7.6.2-omnibus.5.3.0.ci.1-1_amd64.deb
>>>>>>> hi/new_landing_page
install_commands: |
sudo dpkg -i gitlab_7.7.2-omnibus.5.4.2.ci-1_amd64.deb
dependency_commands: |
sudo apt-get install openssh-server
<<<<<<< HEAD
sudo apt-get install postfix
- name: centos6
long_name: CentOS 6 (and RedHat/Oracle/Scientific Linux 6)
download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-6.6/gitlab-7.7.2_omnibus.5.4.2.ci-1.el6.x86_64.rpm
=======
sudo apt-get install postfix # Select 'Internet Site', using sendmail instead also works, exim has problems
sudo dpkg -i gitlab_7.6.2-omnibus.5.3.0.ci.1-1_amd64.deb
- name: centos6
long_name: CentOS 6 (and RedHat/Oracle/Scientific Linux)
download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-6.6/gitlab-7.6.2_omnibus.5.3.0.ci.1-1.el6.x86_64.rpm
>>>>>>> hi/new_landing_page
install_commands: |
sudo rpm -i gitlab-7.7.2_omnibus.5.4.2.ci-1.el6.x86_64.rpm
dependency_commands: |
@@ -69,19 +42,11 @@ platforms:
sudo yum install cronie
sudo service postfix start
sudo chkconfig postfix on
<<<<<<< HEAD
firewall_open: sudo lokkit -s http -s ssh
- name: centos7
long_name: CentOS 7 (and RedHat/Oracle/Scientific Linux 7)
download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-7.0.1406/gitlab-7.7.2_omnibus.5.4.2.ci-1.el7.x86_64.rpm
=======
sudo rpm -i gitlab-7.6.2_omnibus.5.3.0.ci.1-1.el6.x86_64.rpm
post_reconfigure: sudo lokkit -s http -s ssh # open up the firewall for HTTP and SSH requests
- name: centos7
long_name: CentOS 7 (and RedHat/Oracle/Scientific Linux)
download_command: curl -O https://downloads-packages.s3.amazonaws.com/centos-7.0.1406/gitlab-7.6.2_omnibus.5.3.0.ci.1-1.el7.x86_64.rpm
>>>>>>> hi/new_landing_page
install_commands: |
sudo rpm -i gitlab-7.7.2_omnibus.5.4.2.ci-1.el7.x86_64.rpm
dependency_commands: |
@@ -91,14 +56,9 @@ platforms:
sudo yum install postfix
sudo systemctl enable postfix
sudo systemctl start postfix
<<<<<<< HEAD
firewall_open: |
sudo firewall-cmd --permanent --add-service=http
=======
sudo rpm -i gitlab-7.6.2_omnibus.5.3.0.ci.1-1.el7.x86_64.rpm
post_reconfigure: |
sudo firewall-cmd --permanent --add-service=http # open up the firewall for HTTP and SSH requests
>>>>>>> hi/new_landing_page
sudo systemctl reload firewalld
---
<div class="wrapper container">
source/index.html
+ 1
− 32
View file @ 5c6ad9bd
@@ -4,40 +4,11 @@ title: Version Control on your Server | Better than GitHub
suppress_header: true
extra_css:
- landing.css
extra_js:
extra_js: |
- jquery.anythingslider.min.js
- landing_slider.js
---
<div id="landing">
<<<<<<< HEAD
<div class="container">
<div class="row">
<div class="col-sm-12 text-center">
<h1 class="landing-header">
Version Control on your Server
<br>
<div class="landing-sub">
Better than GitHub
</div>
</h1>
<div class="col-sm-12 col-md-12 text-left">
<p class="text-center">
<div class="landing-ctas">
<a href="https://about.gitlab.com/downloads/" class="ce" onClick="_gaq.push(['_trackEvent', 'Landing page', 'call to action', 'Download']);">Download and install the open source GitLab CE in 2 minutes</a>
<br>
<a href="https://about.gitlab.com/pricing/" class="ee" onClick="_gaq.push(['_trackEvent', 'Landing page', 'call to action', 'Pricing']);">Pricing for support and the enterprise features of GitLab EE</a>
<br>
<a href="https://gitlab.com/users/sign_in" class="com" onClick="_gaq.push(['_trackEvent', 'Landing page', 'call to action', 'GitLab.com']);">
Sign up for GitLab.com with unlimited free (private) repositories and collaborators
</a>
<br>
</div>
</p>
</div>
</div>
=======
<div class="container">
<div class="row">
 
@@ -67,10 +38,8 @@ extra_js:
 
</div>
</div>
>>>>>>> hi/new_landing_page
</div>
</div>
</div>
 
<div id="content">
<div class="row text-center logos">
source/stylesheets/base.css
+ 0
− 73
View file @ 5c6ad9bd
@@ -379,8 +379,6 @@ hr.thick {
overflow: hidden;
}
 
<<<<<<< HEAD
=======
#landing h1 {
font-size: 48px;
color: white;
@@ -388,7 +386,6 @@ hr.thick {
padding-top: 50px;
}
 
>>>>>>> hi/new_landing_page
#landing p {
color: white;
font-size: 18px;
@@ -928,75 +925,6 @@ h2.terms {
}
}
@media (max-width: 979px) {
<<<<<<< HEAD
.navbar .btn-dropnav {
display: block;
}
.navbar .nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
display: inline-block;
}
.nav-collapse .dropdown-menu a {
color: #D6DFE5;
font-weight: normal;
}
.nav-collapse .nav > li > a:hover,
.nav-collapse .dropdown-menu a:hover {
background-color: #308CCF;
}
.dropdown-menu li > a:hover,
.dropdown-menu li > a:focus,
.dropdown-submenu:hover > a {
background-image: none;
}
.navbar .nav-collapse.nav .active > a {
margin-left: 5px;
}
.navbar .nav-collapse .nav > li.active > a,
.navbar .nav-collapse .nav > li.active:hover > a,
.navbar .nav-collapse .nav .active > a,
.navbar .nav-collapse .nav .active > a:hover,
.navbar .nav-collapse .nav .active > a:focus {
border-bottom: medium none;
padding: 9px 15px;
}
.navbar .nav-collapse .nav > li > a:hover {
-webkit-animation-name: slide;
-moz-animation-name: slide;
-o-animation-name: slide;
animation-name: slide;
}
.navbar .nav li.dropdown.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle,
.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-webkit-animation-name: none;
-moz-animation-name: none;
-o-animation-name: none;
animation-name: none;
}
#landing {
margin: 0;
}
#landingSlide,
#header,
#content {
margin: 20px -20px;
padding: 30px 20px;
}
.product-plan .feature .pull-right {
float: none;
}
#headline {
margin-left: -20px;
margin-right: -20px;
padding: 20px;
}
#copywrite {
margin-left: -20px;
margin-right: -20px;
padding: 0 20px;
}
=======
.navbar .btn-dropnav {
display: block;
}
@@ -1078,7 +1006,6 @@ h2.terms {
#landing {
height: auto;
}
>>>>>>> hi/new_landing_page
}
 
/* Tablets to Phones
source/stylesheets/landing.css
+ 0
− 5
View file @ 5c6ad9bd
<<<<<<< HEAD
#landing h1 {
font-size: 32px;
color: rgba(255, 255, 255, 1);
@@ -7,8 +6,6 @@
line-height: 41px;
font-weight: 600;
}
=======
body {
background: #fff;
position: relative;
@@ -470,8 +467,6 @@ h1.twitter-head{
top: 0%;
opacity: 1;
}
=======
.quote {
margin-bottom: 50px;
}
>>>>>>> hi/new_landing_page
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