summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitlab-ci.yml62
-rw-r--r--app/assets/stylesheets/generic/header.scss19
-rw-r--r--app/assets/stylesheets/generic/mobile.scss3
-rw-r--r--app/views/doorkeeper/applications/_form.html.haml30
-rw-r--r--app/views/doorkeeper/applications/new.html.haml7
-rw-r--r--app/views/layouts/header/_default.html.haml5
-rw-r--r--app/views/layouts/header/_public.html.haml4
-rw-r--r--app/views/layouts/nav/_profile.html.haml2
-rw-r--r--config/initializers/7_omniauth.rb8
-rw-r--r--doc/development/db_dump.md5
-rw-r--r--doc/release/monthly.md4
-rw-r--r--features/steps/profile/profile.rb2
12 files changed, 91 insertions, 60 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1411a9194b5..8fba268be7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+# This file is generated by GitLab CI
before_script:
- export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
- ruby -v
@@ -7,33 +8,44 @@ before_script:
- echo $PATH
- cp config/database.yml.mysql config/database.yml
- cp config/gitlab.yml.example config/gitlab.yml
- - ! 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
- - ! 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
+ - 'sed "s/username\:.*$/username\: runner/" -i config/database.yml'
+ - 'sed "s/password\:.*$/password\: ''password''/" -i config/database.yml'
- sed "s/gitlabhq_test/gitlabhq_test_$((RANDOM/5000))/" -i config/database.yml
- touch log/application.log
- touch log/test.log
- bundle install --without postgres production --jobs $(nproc)
- bundle exec rake db:create RAILS_ENV=test
-jobs:
-- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
- name: Rspec
- runner: ruby,mysql
-- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
- name: Spinach
- runner: ruby,mysql
-- script:
- - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
- name: Jasmine
- runner: ruby,mysql
-- script:
- - bundle exec rubocop
- name: Rubocop
- runner: ruby,mysql
-- script:
- - bundle exec rake brakeman
- name: Brakeman
- runner: ruby,mysql
-deploy_jobs: []
-skip_refs: ''
+Rspec:
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
+ tags:
+ - ruby
+ - mysql
+
+Spinach:
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
+ tags:
+ - ruby
+ - mysql
+
+Jasmine:
+ script:
+ - RAILS_ENV=test SIMPLECOV=true bundle exec rake jasmine:ci
+ tags:
+ - ruby
+ - mysql
+
+Rubocop:
+ script:
+ - bundle exec rubocop
+ tags:
+ - ruby
+ - mysql
+
+Brakeman:
+ script:
+ - bundle exec rake brakeman
+ tags:
+ - ruby
+ - mysql \ No newline at end of file
diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index 5e8701830e7..8f17232592e 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -98,16 +98,16 @@ header {
height: $header-height;
.title {
- position: relative;
- float: left;
margin: 0;
- margin-left: 35px;
+ padding: 0 15px 0 35px;
+ overflow: hidden;
font-size: 18px;
line-height: $header-height;
font-weight: bold;
color: #444;
-
- @include str-truncated(37%);
+ text-overflow: ellipsis;
+ vertical-align: top;
+ white-space: nowrap;
a {
color: #444;
@@ -116,6 +116,10 @@ header {
}
}
}
+
+ .navbar-collapse {
+ float: right;
+ }
}
.search {
@@ -167,10 +171,6 @@ header {
}
@media (max-width: $screen-md-max) {
- header .container .title {
- max-width: 43%;
- }
-
.header-collapsed, .header-expanded {
@include collapsed-header;
}
@@ -190,7 +190,6 @@ header {
font-size: 18px;
.title {
- max-width: 70%;
}
.navbar-nav {
diff --git a/app/assets/stylesheets/generic/mobile.scss b/app/assets/stylesheets/generic/mobile.scss
index f04c8eef904..a49775daf8b 100644
--- a/app/assets/stylesheets/generic/mobile.scss
+++ b/app/assets/stylesheets/generic/mobile.scss
@@ -61,8 +61,7 @@
}
.container .title {
- margin-left: 15px !important;
- max-width: 70% !important;
+ padding-left: 15px !important;
}
.issue-info, .merge-request-info {
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml
index a5fec2fabdb..98a61ab211b 100644
--- a/app/views/doorkeeper/applications/_form.html.haml
+++ b/app/views/doorkeeper/applications/_form.html.haml
@@ -1,17 +1,22 @@
= form_for application, url: doorkeeper_submit_path(application), html: {class: 'form-horizontal', role: 'form'} do |f|
- if application.errors.any?
- .alert.alert-danger{"data-alert" => ""}
- %p Whoops! Check your form for possible errors
- = content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do
- = f.label :name, class: 'col-sm-2 control-label'
+ .alert.alert-danger
+ %ul
+ - application.errors.full_messages.each do |msg|
+ %li= msg
+
+ .form-group
+ = f.label :name, class: 'control-label'
+
.col-sm-10
- = f.text_field :name, class: 'form-control'
- = doorkeeper_errors_for application, :name
- = content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" do
- = f.label :redirect_uri, class: 'col-sm-2 control-label'
+ = f.text_field :name, class: 'form-control', required: true
+
+ .form-group
+ = f.label :redirect_uri, class: 'control-label'
+
.col-sm-10
- = f.text_area :redirect_uri, class: 'form-control'
- = doorkeeper_errors_for application, :redirect_uri
+ = f.text_area :redirect_uri, class: 'form-control', required: true
+
%span.help-block
Use one line per URI
- if Doorkeeper.configuration.native_redirect_uri
@@ -19,6 +24,7 @@
Use
%code= Doorkeeper.configuration.native_redirect_uri
for local tests
+
.form-actions
- = f.submit 'Submit', class: "btn btn-primary wide"
- = link_to "Cancel", applications_profile_path, class: "btn btn-default"
+ = f.submit 'Submit', class: "btn btn-create"
+ = link_to "Cancel", applications_profile_path, class: "btn btn-cancel"
diff --git a/app/views/doorkeeper/applications/new.html.haml b/app/views/doorkeeper/applications/new.html.haml
index 655845e4af5..fd32a468b45 100644
--- a/app/views/doorkeeper/applications/new.html.haml
+++ b/app/views/doorkeeper/applications/new.html.haml
@@ -1,2 +1,7 @@
-%h3.page-title New application
+- page_title "New Application"
+
+%h3.page-title New Application
+
+%hr
+
= render 'form', application: @application \ No newline at end of file
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 8b4510d6516..4ec50f35890 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -5,9 +5,6 @@
= brand_header_logo
%h3 GitLab
.header-content
- %h1.title
- = title
-
%button.navbar-toggle
%span.sr-only Toggle navigation
= icon('bars')
@@ -43,4 +40,6 @@
= link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('sign-out')
+ %h1.title= title
+
= render 'shared/outdated_browser'
diff --git a/app/views/layouts/header/_public.html.haml b/app/views/layouts/header/_public.html.haml
index 6a031722aaa..2c5884a5b6d 100644
--- a/app/views/layouts/header/_public.html.haml
+++ b/app/views/layouts/header/_public.html.haml
@@ -5,10 +5,10 @@
= brand_header_logo
%h3 GitLab
.header-content
- %h1.title= title
-
- unless current_controller?('sessions')
.pull-right
= link_to "Sign in", new_session_path(:user, redirect_to_referer: 'yes'), class: 'btn btn-sign-in btn-success btn-sm'
+ %h1.title= title
+
= render 'shared/outdated_browser'
diff --git a/app/views/layouts/nav/_profile.html.haml b/app/views/layouts/nav/_profile.html.haml
index 121665bd536..914e1b83d1f 100644
--- a/app/views/layouts/nav/_profile.html.haml
+++ b/app/views/layouts/nav/_profile.html.haml
@@ -9,7 +9,7 @@
= icon('gear fw')
%span
Account
- = nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new']) do
+ = nav_link(path: ['profiles#applications', 'applications#edit', 'applications#show', 'applications#new', 'applications#create']) do
= link_to applications_profile_path, title: 'Applications', data: {placement: 'right'} do
= icon('cloud fw')
%span
diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb
index 6f1f267bf97..df73ec1304a 100644
--- a/config/initializers/7_omniauth.rb
+++ b/config/initializers/7_omniauth.rb
@@ -17,3 +17,11 @@ OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_s
OmniAuth.config.before_request_phase do |env|
OmniAuth::RequestForgeryProtection.new(env).call
end
+
+if Gitlab.config.omniauth.enabled
+ Gitlab.config.omniauth.providers.each do |provider|
+ if provider['name'] == 'kerberos'
+ require 'omniauth-kerberos'
+ end
+ end
+end
diff --git a/doc/development/db_dump.md b/doc/development/db_dump.md
index 4ad3bd534e0..21f1b3edecd 100644
--- a/doc/development/db_dump.md
+++ b/doc/development/db_dump.md
@@ -4,6 +4,9 @@ Sometimes it is useful to import the database from a production environment
into a staging environment for testing. The procedure below assumes you have
SSH+sudo access to both the production environment and the staging VM.
+**Destroy your staging VM** when you are done with it. It is important to avoid
+data leaks.
+
On the staging VM, add the following line to `/etc/gitlab/gitlab.rb` to speed up
large database imports.
@@ -12,6 +15,8 @@ large database imports.
echo "postgresql['checkpoint_segments'] = 64" | sudo tee -a /etc/gitlab/gitlab.rb
sudo touch /etc/gitlab/skip-auto-migrations
sudo gitlab-ctl reconfigure
+sudo gitlab-ctl stop unicorn
+sudo gitlab-ctl stop sidekiq
```
Next, we let the production environment stream a compressed SQL dump to our
diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index 8d475296a22..d50258f2796 100644
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
@@ -30,9 +30,6 @@ All steps from issue template are explained below
```
Xth: (7 working days before the 22nd)
-- [ ] Update the CE changelog (#LINK)
-- [ ] Update the EE changelog (#LINK)
-- [ ] Update the CI changelog (#LINK)
- [ ] Triage the omnibus-gitlab milestone
Xth: (6 working days before the 22nd)
@@ -41,6 +38,7 @@ Xth: (6 working days before the 22nd)
- [ ] Determine QA person and notify this person
- [ ] Check the tasks in [how to rc1 guide](https://dev.gitlab.org/gitlab/gitlabhq/blob/master/doc/release/howto_rc1.md) and delegate tasks if necessary
- [ ] Create CE, EE, CI RC1 versions (#LINK)
+- [ ] Build RC1 packages (EE first) (#LINK)
Xth: (5 working days before the 22nd)
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb
index 649aea8e3f4..10bd307320e 100644
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
@@ -176,7 +176,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
end
step 'I should see application form' do
- expect(page).to have_content "New application"
+ expect(page).to have_content "New Application"
end
step 'I fill application form out and submit' do
View Lorry Controller Status