Commit e1302007 authored by Martin Cabrera's avatar Martin Cabrera

Merge branch 'master' into i-#25814-500-error

parents 6972a35f 34087fe3
...@@ -343,10 +343,6 @@ Style/ParenthesesAroundCondition: ...@@ -343,10 +343,6 @@ Style/ParenthesesAroundCondition:
Style/RedundantParentheses: Style/RedundantParentheses:
Enabled: true Enabled: true
# Don't use return where it's not required.
Style/RedundantReturn:
Enabled: true
# Don't use semicolons to terminate expressions. # Don't use semicolons to terminate expressions.
Style/Semicolon: Style/Semicolon:
Enabled: true Enabled: true
......
This diff is collapsed.
...@@ -2,6 +2,16 @@ ...@@ -2,6 +2,16 @@
documentation](doc/development/changelog.md) for instructions on adding your own documentation](doc/development/changelog.md) for instructions on adding your own
entry. entry.
## 8.15.4 (2017-01-09)
- Make successful pipeline emails off for watchers. !8176
- Speed up group milestone index by passing group_id to IssuesFinder. !8363
- Don't instrument 405 Grape calls. !8445
- Update the gitlab-markup gem to the version 1.5.1. !8509
- Updated Turbolinks to mitigate potential XSS attacks.
- Re-order update steps in the 8.14 -> 8.15 upgrade guide.
- Re-add Google Cloud Storage as a backup strategy.
## 8.15.3 (2017-01-06) ## 8.15.3 (2017-01-06)
- Rename wiki_events to wiki_page_events in project hooks API to avoid errors. !8425 - Rename wiki_events to wiki_page_events in project hooks API to avoid errors. !8425
...@@ -255,6 +265,11 @@ entry. ...@@ -255,6 +265,11 @@ entry.
- Whitelist next project names: help, ci, admin, search. !8227 - Whitelist next project names: help, ci, admin, search. !8227
- Adds back CSS for progress-bars. !8237 - Adds back CSS for progress-bars. !8237
## 8.14.6 (2017-01-10)
- Update the gitlab-markup gem to the version 1.5.1. !8509
- Updated Turbolinks to mitigate potential XSS attacks.
## 8.14.5 (2016-12-14) ## 8.14.5 (2016-12-14)
- Moved Leave Project and Leave Group buttons to access_request_buttons from the settings dropdown. !7600 - Moved Leave Project and Leave Group buttons to access_request_buttons from the settings dropdown. !7600
...@@ -532,6 +547,11 @@ entry. ...@@ -532,6 +547,11 @@ entry.
- Fix "Without projects" filter. !6611 (Ben Bodenmiller) - Fix "Without projects" filter. !6611 (Ben Bodenmiller)
- Fix 404 when visit /projects page - Fix 404 when visit /projects page
## 8.13.11 (2017-01-10)
- Update the gitlab-markup gem to the version 1.5.1. !8509
- Updated Turbolinks to mitigate potential XSS attacks.
## 8.13.10 (2016-12-14) ## 8.13.10 (2016-12-14)
- API: Memoize the current_user so that sudo can work properly. !8017 - API: Memoize the current_user so that sudo can work properly. !8017
......
...@@ -221,8 +221,7 @@ gem 'chronic_duration', '~> 0.10.6' ...@@ -221,8 +221,7 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'sass-rails', '~> 5.0.6' gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0' gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2' gem 'uglifier', '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0' gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
gem 'jquery-turbolinks', '~> 2.1.0'
gem 'addressable', '~> 2.3.8' gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0' gem 'bootstrap-sass', '~> 3.3.0'
......
...@@ -264,6 +264,8 @@ GEM ...@@ -264,6 +264,8 @@ GEM
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3) posix-spawn (~> 0.3)
gitlab-markup (1.5.1) gitlab-markup (1.5.1)
gitlab-turbolinks-classic (2.5.6)
coffee-rails
gitlab_omniauth-ldap (1.2.1) gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9) net-ldap (~> 0.9)
omniauth (~> 1.0) omniauth (~> 1.0)
...@@ -370,9 +372,6 @@ GEM ...@@ -370,9 +372,6 @@ GEM
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
jquery-ui-rails (5.0.5) jquery-ui-rails (5.0.5)
railties (>= 3.2.16) railties (>= 3.2.16)
json (1.8.3) json (1.8.3)
...@@ -782,8 +781,6 @@ GEM ...@@ -782,8 +781,6 @@ GEM
truncato (0.7.8) truncato (0.7.8)
htmlentities (~> 4.3.1) htmlentities (~> 4.3.1)
nokogiri (~> 1.6.1) nokogiri (~> 1.6.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
u2f (0.2.1) u2f (0.2.1)
...@@ -893,6 +890,7 @@ DEPENDENCIES ...@@ -893,6 +890,7 @@ DEPENDENCIES
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1) gitlab-markup (~> 1.5.1)
gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
gitlab_omniauth-ldap (~> 1.2.1) gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.2) gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.2) gollum-rugged_adapter (~> 0.4.2)
...@@ -911,7 +909,6 @@ DEPENDENCIES ...@@ -911,7 +909,6 @@ DEPENDENCIES
jira-ruby (~> 1.1.2) jira-ruby (~> 1.1.2)
jquery-atwho-rails (~> 1.3.2) jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 4.1.0) jquery-rails (~> 4.1.0)
jquery-turbolinks (~> 2.1.0)
jquery-ui-rails (~> 5.0.0) jquery-ui-rails (~> 5.0.0)
json-schema (~> 2.6.2) json-schema (~> 2.6.2)
jwt jwt
...@@ -1010,7 +1007,6 @@ DEPENDENCIES ...@@ -1010,7 +1007,6 @@ DEPENDENCIES
thin (~> 1.7.0) thin (~> 1.7.0)
timecop (~> 0.8.0) timecop (~> 0.8.0)
truncato (~> 0.7.8) truncato (~> 0.7.8)
turbolinks (~> 2.5.0)
u2f (~> 0.2.1) u2f (~> 0.2.1)
uglifier (~> 2.7.2) uglifier (~> 2.7.2)
underscore-rails (~> 1.8.0) underscore-rails (~> 1.8.0)
......
...@@ -41,6 +41,21 @@ body { ...@@ -41,6 +41,21 @@ body {
} }
} }
.alert-link-group {
float: right;
}
/* Center alert text and alert action links on smaller screens */
@media (max-width: $screen-sm-max) {
.alert {
text-align: center;
}
.alert-link-group {
float: none;
}
}
/* Stripe the background colors so that adjacent alert-warnings are distinct from one another */ /* Stripe the background colors so that adjacent alert-warnings are distinct from one another */
.alert-warning { .alert-warning {
transition: background-color 0.15s, border-color 0.15s; transition: background-color 0.15s, border-color 0.15s;
......
...@@ -37,10 +37,6 @@ ...@@ -37,10 +37,6 @@
display: none; display: none;
} }
.project-avatar {
display: none;
}
.project-home-panel { .project-home-panel {
padding-left: 0 !important; padding-left: 0 !important;
......
...@@ -183,9 +183,11 @@ ...@@ -183,9 +183,11 @@
&.right-sidebar-expanded { &.right-sidebar-expanded {
.line-resolve-all-container { .line-resolve-all-container {
@media (min-width: $sidebar-breakpoint) {
display: none; display: none;
} }
} }
}
} }
header.header-sidebar-pinned { header.header-sidebar-pinned {
......
// Limit MR description for side-by-side diff view
.fixed-width-container {
max-width: $limited-layout-width - ($gl-padding * 2);
margin-left: auto;
margin-right: auto;
}
.limit-container-width {
.detail-page-header {
@extend .fixed-width-container;
}
.issuable-details {
.detail-page-description,
.mr-source-target,
.mr-state-widget,
.merge-manually {
@extend .fixed-width-container;
}
.merge-request-tabs-holder {
&.affix {
border-bottom: 1px solid $border-color;
.nav-links {
border: 0;
}
}
.container-fluid {
@extend .fixed-width-container;
}
}
}
.merge-request-details {
.emoji-list-container {
@extend .fixed-width-container;
}
}
.diffs {
.mr-version-controls,
.files-changed {
@extend .fixed-width-container;
}
}
}
.issuable-details { .issuable-details {
section { section {
.issuable-discussion { .issuable-discussion {
......
...@@ -526,8 +526,9 @@ ul.notes { ...@@ -526,8 +526,9 @@ ul.notes {
} }
.line-resolve-all { .line-resolve-all {
vertical-align: middle;
display: inline-block; display: inline-block;
padding: 5px 10px; padding: 6px 10px;
background-color: $gray-light; background-color: $gray-light;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
...@@ -535,18 +536,14 @@ ul.notes { ...@@ -535,18 +536,14 @@ ul.notes {
&.has-next-btn { &.has-next-btn {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-right: 0;
} }
.line-resolve-btn { .line-resolve-btn {
vertical-align: middle;
margin-right: 5px; margin-right: 5px;
} }
} }
.line-resolve-text {
vertical-align: middle;
}
.line-resolve-btn { .line-resolve-btn {
display: inline-block; display: inline-block;
position: relative; position: relative;
......
...@@ -587,11 +587,21 @@ pre.light-well { ...@@ -587,11 +587,21 @@ pre.light-well {
.project-full-name { .project-full-name {
@include str-truncated; @include str-truncated;
@media (max-width: $screen-xs-max) {
max-width: 50%;
}
} }
.controls { .controls {
line-height: $list-text-height; line-height: $list-text-height;
.badge {
@media (max-width: $screen-xs-max) {
display: none;
}
}
a:hover { a:hover {
text-decoration: none; text-decoration: none;
} }
...@@ -605,6 +615,12 @@ pre.light-well { ...@@ -605,6 +615,12 @@ pre.light-well {
top: 2px; top: 2px;
} }
} }
.description p {
@media (max-width: $screen-xs-max) {
max-width: 50%;
}
}
} }
.bottom { .bottom {
......
- @content_class = "limit-container-width" - @content_class = "limit-container-width" unless fluid_layout
- page_title "#{@issue.title} (#{@issue.to_reference})", "Issues" - page_title "#{@issue.title} (#{@issue.to_reference})", "Issues"
- page_description @issue.description - page_description @issue.description
- page_card_attributes @issue.card_attributes - page_card_attributes @issue.card_attributes
......
- @content_class = "limit-container-width" - @content_class = "limit-container-width" unless fluid_layout
- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests" - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
- page_description @merge_request.description - page_description @merge_request.description
- page_card_attributes @merge_request.card_attributes - page_card_attributes @merge_request.card_attributes
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
= succeed '.' do = succeed '.' do
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
.content-block.content-block-small .content-block.content-block-small.emoji-list-container
= render 'award_emoji/awards_block', awardable: @merge_request, inline: true = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
.merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') } .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
......
- if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.require_password? - if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.require_password?
.no-password-message.alert.alert-warning.hidden-xs .no-password-message.alert.alert-warning
You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account
.pull-right .alert-link-group
= link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put
| |
= link_to 'Remind later', '#', class: 'hide-no-password-message' = link_to 'Remind later', '#', class: 'hide-no-password-message'
- if cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key? - if cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key?
.no-ssh-key-message.alert.alert-warning.hidden-xs .no-ssh-key-message.alert.alert-warning
You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', profile_keys_path, class: 'alert-link'} to your profile You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', profile_keys_path, class: 'alert-link'} to your profile
.pull-right .alert-link-group
= link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link' = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link'
| |
= link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link' = link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link'
---
title: Changed alerts to be responsive, centered text on smaller viewports
merge_request: 8424
author: Connor Smallman
---
title: Display project avatars on Admin Area and Projects pages for mobile views
merge_request:
author: Ryan Harris
---
title: 26504 Fix styling of MR jump to discussion button
merge_request:
author:
---
title: Fix 500 error when POSTing to Users API with optional confirm param
merge_request:
author:
---
title: Speed up group milestone index by passing group_id to IssuesFinder
merge_request: 8363
author:
...@@ -94,7 +94,7 @@ In the example below we use Amazon S3 for storage, but Fog also lets you use ...@@ -94,7 +94,7 @@ In the example below we use Amazon S3 for storage, but Fog also lets you use
for AWS, Google, OpenStack Swift and Rackspace as well. A local driver is for AWS, Google, OpenStack Swift and Rackspace as well. A local driver is
[also available](#uploading-to-locally-mounted-shares). [also available](#uploading-to-locally-mounted-shares).
For omnibus packages: For omnibus packages, add the following to `/etc/gitlab/gitlab.rb`:
```ruby ```ruby
gitlab_rails['backup_upload_connection'] = { gitlab_rails['backup_upload_connection'] = {
...@@ -109,6 +109,8 @@ gitlab_rails['backup_upload_connection'] = { ...@@ -109,6 +109,8 @@ gitlab_rails['backup_upload_connection'] = {
gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket' gitlab_rails['backup_upload_remote_directory'] = 'my.s3.bucket'
``` ```
Make sure to run `sudo gitlab-ctl reconfigure` after editing `/etc/gitlab/gitlab.rb` to reflect the changes.
For installations from source: For installations from source:
```yaml ```yaml
......
...@@ -5,6 +5,9 @@ GitLab support is enabled on your GitLab instance. ...@@ -5,6 +5,9 @@ GitLab support is enabled on your GitLab instance.
You can read more about GitLab support [here](http://docs.gitlab.com/ce/integration/gitlab.html) You can read more about GitLab support [here](http://docs.gitlab.com/ce/integration/gitlab.html)
To get to the importer page you need to go to "New project" page. To get to the importer page you need to go to "New project" page.
>**Note:**
If you are interested in importing Wiki and Merge Request data to your new instance, you'll need to follow the instructions for [project export](../../user/project/settings/import_export.md)
![New project page](gitlab_importer/new_project_page.png) ![New project page](gitlab_importer/new_project_page.png)
Click on the "Import projects from GitLab.com" link and you will be redirected to GitLab.com Click on the "Import projects from GitLab.com" link and you will be redirected to GitLab.com
......
...@@ -93,7 +93,7 @@ module API ...@@ -93,7 +93,7 @@ module API
# Filter out params which are used later # Filter out params which are used later
user_params = declared_params(include_missing: false) user_params = declared_params(include_missing: false)
identity_attrs = user_params.slice(:provider, :extern_uid) identity_attrs = user_params.slice(:provider, :extern_uid)
confirm = params.delete(:confirm) confirm = user_params.delete(:confirm)
user = User.new(user_params.except(:extern_uid, :provider)) user = User.new(user_params.except(:extern_uid, :provider))
user.skip_confirmation! unless confirm user.skip_confirmation! unless confirm
......
...@@ -137,6 +137,15 @@ describe API::Users, api: true do ...@@ -137,6 +137,15 @@ describe API::Users, api: true do
expect(new_user.can_create_group).to eq(true) expect(new_user.can_create_group).to eq(true)
end end
it "creates user with optional attributes" do
optional_attributes = { confirm: true }
attributes = attributes_for(:user).merge(optional_attributes)
post api('/users', admin), attributes
expect(response).to have_http_status(201)
end
it "creates non-admin user" do it "creates non-admin user" do
post api('/users', admin), attributes_for(:user, admin: false, can_create_group: false) post api('/users', admin), attributes_for(:user, admin: false, can_create_group: false)
expect(response).to have_http_status(201) expect(response).to have_http_status(201)
......
// Generated by CoffeeScript 1.7.1
/*
jQuery.Turbolinks ~ https://github.com/kossnocorp/jquery.turbolinks
jQuery plugin for drop-in fix binded events problem caused by Turbolinks
The MIT License
Copyright (c) 2012-2013 Sasha Koss & Rico Sta. Cruz
*/
(function() {
var $, $document;
$ = window.jQuery || (typeof require === "function" ? require('jquery') : void 0);
$document = $(document);
$.turbo = {
version: '2.1.0',
isReady: false,
use: function(load, fetch) {
return $document.off('.turbo').on("" + load + ".turbo", this.onLoad).on("" + fetch + ".turbo", this.onFetch);
},
addCallback: function(callback) {
if ($.turbo.isReady) {
callback($);
}
return $document.on('turbo:ready', function() {
return callback($);
});
},
onLoad: function() {
$.turbo.isReady = true;
return $document.trigger('turbo:ready');
},
onFetch: function() {
return $.turbo.isReady = false;
},
register: function() {
$(this.onLoad);
return $.fn.ready = this.addCallback;
}
};
$.turbo.register();
$.turbo.use('page:load', 'page:fetch');
}).call(this);
...@@ -35,6 +35,8 @@ captures/ ...@@ -35,6 +35,8 @@ captures/
# Intellij # Intellij
*.iml *.iml
.idea/workspace.xml .idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/libraries .idea/libraries
# Keystore files # Keystore files
......
# http://www.gnu.org/software/automake # http://www.gnu.org/software/automake
Makefile.in Makefile.in
/ar-lib
/mdate-sh
/py-compile
/test-driver
/ylwrap
# http://www.gnu.org/software/autoconf # http://www.gnu.org/software/autoconf
...@@ -9,10 +14,20 @@ Makefile.in ...@@ -9,10 +14,20 @@ Makefile.in
/autoscan-*.log /autoscan-*.log
/aclocal.m4 /aclocal.m4
/compile /compile
/config.guess
/config.h.in /config.h.in
/config.sub
/configure /configure
/configure.scan /configure.scan
/depcomp /depcomp
/install-sh /install-sh
/missing /missing
/stamp-h1 /stamp-h1
# https://www.gnu.org/software/libtool/
/ltmain.sh
# http://www.gnu.org/software/texinfo
/texinfo.tex
...@@ -4,4 +4,5 @@ CMakeScripts ...@@ -4,4 +4,5 @@ CMakeScripts
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
compile_commands.json
CTestTestfile.cmake CTestTestfile.cmake
pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
Leiningen.gitignore
\ No newline at end of file
...@@ -4,3 +4,8 @@ ...@@ -4,3 +4,8 @@
*/cache/* */cache/*
!*/cache/index.html !*/cache/index.html
!*/cache/.htaccess !*/cache/.htaccess
user_guide_src/build/*
user_guide_src/cilexer/build/*
user_guide_src/cilexer/dist/*
user_guide_src/cilexer/pycilexer.egg-info/*
*.FASL *.FASL
*.fasl *.fasl
*.lisp-temp *.lisp-temp
*.dfsl
*.pfsl
*.d64fsl
*.p64fsl
*.lx64fsl
*.lx32fsl
*.dx64fsl
*.dx32fsl
*.fx64fsl
*.fx32fsl
*.sx64fsl
*.sx32fsl
*.wx64fsl
*.wx32fsl
*.vo .*.aux
*.a
*.cma
*.cmi
*.cmo
*.cmx
*.cmxa
*.cmxs
*.glob *.glob
*.ml.d
*.ml4.d
*.mli.d
*.mllib.d
*.mlpack.d
*.native
*.o
*.v.d *.v.d
*.vio
*.vo
.coq-native/
.csdp.cache
.lia.cache
.nia.cache
.nlia.cache
.nra.cache
csdp.cache
lia.cache
nia.cache
nlia.cache
nra.cache
# See https://www.dartlang.org/tools/private-files.html # See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub # Files and directories created by pub
.buildlog
# SDK 1.20 and later (no longer creates packages directories)
.packages .packages
.project
.pub/ .pub/
build/ build/
# Older SDK versions
# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
.project
.buildlog
**/packages/ **/packages/
# Files created by dart2js # Files created by dart2js
# (Most Dart developers will use pub build to compile Dart, use/modify these # (Most Dart developers will use pub build to compile Dart, use/modify these
# rules if you intend to use dart2js directly # rules if you intend to use dart2js directly
......
...@@ -3,3 +3,9 @@ ...@@ -3,3 +3,9 @@
# Packaging # Packaging
.cask .cask
# Backup files
*~
# Undo-tree save-files
*.~undo-tree
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
/deps /deps
erl_crash.dump erl_crash.dump
*.ez *.ez
*.beam
...@@ -40,3 +40,6 @@ flycheck_*.el ...@@ -40,3 +40,6 @@ flycheck_*.el
# projectiles files # projectiles files
.projectile .projectile
# directory configuration
.dir-locals.el
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.idea/tasks.xml .idea/tasks.xml
# Sensitive or high-churn files: # Sensitive or high-churn files:
.idea/dataSources/
.idea/dataSources.ids .idea/dataSources.ids
.idea/dataSources.xml .idea/dataSources.xml
.idea/dataSources.local.xml .idea/dataSources.local.xml
......
...@@ -20,6 +20,9 @@ Package Control.ca-bundle ...@@ -20,6 +20,9 @@ Package Control.ca-bundle
Package Control.system-ca-bundle Package Control.system-ca-bundle
Package Control.cache/ Package Control.cache/
Package Control.ca-certs/ Package Control.ca-certs/
Package Control.merged-ca-bundle
Package Control.user-ca-bundle
oscrypto-ca-bundle.crt
bh_unicode_properties.cache bh_unicode_properties.cache
# Sublime-github package stores a github token in this file # Sublime-github package stores a github token in this file
......
# swap # swap
[._]*.s[a-w][a-z] [._]*.s[a-v][a-z]
[._]s[a-w][a-z] [._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session # session
Session.vim Session.vim
# temporary # temporary
......
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
!.vscode/launch.json !.vscode/launch.json
!.vscode/extensions.json
# Windows image file caches # Windows thumbnail cache files
Thumbs.db Thumbs.db
ehthumbs.db ehthumbs.db
ehthumbs_vista.db
# Folder config file # Folder config file
Desktop.ini Desktop.ini
......
...@@ -26,5 +26,5 @@ _testmain.go ...@@ -26,5 +26,5 @@ _testmain.go
# Output of the go coverage tool, specifically when used with LiteIDE # Output of the go coverage tool, specifically when used with LiteIDE
*.out *.out
# external packages folder # External packages folder
vendor/ vendor/
*.class *.class
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME) # Mobile Tools for Java (J2ME)
.mtj.tmp/ .mtj.tmp/
......
...@@ -6,8 +6,8 @@ bootstrap/compiled.php ...@@ -6,8 +6,8 @@ bootstrap/compiled.php
app/storage/ app/storage/
# Laravel 5 & Lumen specific # Laravel 5 & Lumen specific
bootstrap/cache/
public/storage public/storage
storage/*.key
.env.*.php .env.*.php
.env.php .env.php
.env .env
......
...@@ -7,3 +7,6 @@ release.properties ...@@ -7,3 +7,6 @@ release.properties
dependency-reduced-pom.xml dependency-reduced-pom.xml
buildNumber.properties buildNumber.properties
.mvn/timing.properties .mvn/timing.properties
# Exclude maven wrapper
!/.mvn/wrapper/maven-wrapper.jar
...@@ -42,3 +42,7 @@ jspm_packages ...@@ -42,3 +42,7 @@ jspm_packages
# Output of 'npm pack' # Output of 'npm pack'
*.tgz *.tgz
# Yarn Integrity file
.yarn-integrity
/blib/
/.build/
_build/
cover_db/
inc/
Build
!Build/ !Build/
Build.bat
.last_cover_stats .last_cover_stats
/Makefile
/Makefile.old
/MANIFEST.bak
/META.yml /META.yml
/META.json /META.json
/MYMETA.* /MYMETA.*
nytprof.out
/pm_to_blib
*.o *.o
*.bs *.bs
# Devel::Cover
cover_db/
# Devel::NYTProf
nytprof.out
# Dizt::Zilla
/.build/
# Module::Build
_build/
Build
Build.bat
# Module::Install
inc/
# ExtUitls::MakeMaker
/blib/
/_eumm/ /_eumm/
/*.gz
/Makefile
/Makefile.old
/MANIFEST.bak
/pm_to_blib
/*.zip
...@@ -20,6 +20,7 @@ lib64/ ...@@ -20,6 +20,7 @@ lib64/
parts/ parts/
sdist/ sdist/
var/ var/
wheels/
*.egg-info/ *.egg-info/
.installed.cfg .installed.cfg
*.egg *.egg
......
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
/web/bundles/ /web/bundles/
/web/uploads/ /web/uploads/
# Assets managed by Bower
/web/assets/vendor/
# PHPUnit # PHPUnit
/app/phpunit.xml /app/phpunit.xml
/phpunit.xml /phpunit.xml
...@@ -45,4 +42,4 @@ ...@@ -45,4 +42,4 @@
/composer.phar /composer.phar
# Backup entities generated with doctrine:generate:entities command # Backup entities generated with doctrine:generate:entities command
*/Entity/*~ **/Entity/*~
...@@ -52,12 +52,22 @@ acs-*.bib ...@@ -52,12 +52,22 @@ acs-*.bib
# beamer # beamer
*.nav *.nav
*.pre
*.snm *.snm
*.vrb *.vrb
# changes
*.soc
# cprotect # cprotect
*.cpt *.cpt
# elsarticle (documentclass of Elsevier journals)
*.spl
# endnotes
*.ent
# fixme # fixme
*.lox *.lox
...@@ -123,9 +133,7 @@ acs-*.bib ...@@ -123,9 +133,7 @@ acs-*.bib
*.maf *.maf
*.mlf *.mlf
*.mlt *.mlt
*.mtc *.mtc[0-9]*
*.mtc[0-9]
*.mtc[1-9][0-9]
# minted # minted
_minted* _minted*
...@@ -140,6 +148,9 @@ _minted* ...@@ -140,6 +148,9 @@ _minted*
# nomencl # nomencl
*.nlo *.nlo
# pax
*.pax
# sagetex # sagetex
*.sagetex.sage *.sagetex.sage
*.sagetex.py *.sagetex.py
...@@ -204,3 +215,6 @@ TSWLatexianTemp* ...@@ -204,3 +215,6 @@ TSWLatexianTemp*
# auto folder when using emacs and auctex # auto folder when using emacs and auctex
/auto/* /auto/*
# expex forward references with \gathertags
*-tags.tex
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
*.user *.user
*.userosscache *.userosscache
*.sln.docstates *.sln.docstates
*.vcxproj.filters
# User-specific files (MonoDevelop/Xamarin Studio) # User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs *.userprefs
...@@ -43,11 +42,11 @@ TestResult.xml ...@@ -43,11 +42,11 @@ TestResult.xml
[Rr]eleasePS/ [Rr]eleasePS/
dlldata.c dlldata.c
# DNX # .NET Core
project.lock.json project.lock.json
project.fragment.lock.json project.fragment.lock.json
artifacts/ artifacts/
Properties/launchSettings.json **/Properties/launchSettings.json
*_i.c *_i.c
*_p.c *_p.c
......
...@@ -7,6 +7,7 @@ services: ...@@ -7,6 +7,7 @@ services:
build: build:
stage: build stage: build
script: script:
- export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-')
- docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" . - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" .
- docker push "$CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME" - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
# This template uses the non default language docker image image: elixir:latest
# The image already has Hex installed. You might want to consider to use `elixir:latest`
image: trenpixster/elixir:latest
# Pick zero or more services to be used on all builds. # Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in. # Only needed when using a docker container to run your tests in.
...@@ -11,6 +9,8 @@ services: ...@@ -11,6 +9,8 @@ services:
- postgres:latest - postgres:latest
before_script: before_script:
- mix local.rebar --force
- mix local.hex --force
- mix deps.get - mix deps.get
mix: mix:
......
image: golang:latest
# The problem is that to be able to use go get, one needs to put
# the repository in the $GOPATH. So for example if your gitlab domain
# is mydomainperso.com, and that your repository is repos/projectname, and
# the default GOPATH being /go, then you'd need to have your
# repository in /go/src/mydomainperso.com/repos/projectname
# Thus, making a symbolic link corrects this.
before_script:
- ln -s /builds /go/src/mydomainperso.com
- cd /go/src/mydomainperso.com/repos/projectname
stages:
- test
- build
format:
stage: test
script:
# Add here all the dependencies, or use glide/govendor to get
# them automatically.
# - curl https://glide.sh/get | sh
- go get github.com/alecthomas/kingpin
- go tool vet -composites=false -shadow=true *.go
- go test -race $(go list ./... | grep -v /vendor/)
compile:
stage: build
script:
# Add here all the dependencies, or use glide/govendor/...
# to get them automatically.
- go get github.com/alecthomas/kingpin
# Better put this in a Makefile
- go build -race -ldflags "-extldflags '-static'" -o mybinary
artifacts:
paths:
- mybinary
...@@ -31,4 +31,4 @@ build: ...@@ -31,4 +31,4 @@ build:
test: test:
stage: test stage: test
script: script:
- ./gradlew -g /cache./gradle check - ./gradlew -g /cache/.gradle check
# This file is a template, and might need editing before it works on your project.
image: ayufan/openshift-cli
stages:
- test
- review
- staging
- production
variables:
OPENSHIFT_SERVER: openshift.default.svc.cluster.local
# OPENSHIFT_DOMAIN: apps.example.com
# Configure this variable in Secure Variables:
# OPENSHIFT_TOKEN: my.openshift.token
test1:
stage: test
before_script: []
script:
- echo run tests
test2:
stage: test
before_script: []
script:
- echo run tests
.deploy: &deploy
before_script:
- oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify
- oc project "$CI_PROJECT_NAME" 2> /dev/null || oc new-project "$CI_PROJECT_NAME"
script:
- "oc get services $APP 2> /dev/null || oc new-app . --name=$APP --strategy=docker"
- "oc start-build $APP --from-dir=. --follow || sleep 3s || oc start-build $APP --from-dir=. --follow"
- "oc get routes $APP 2> /dev/null || oc expose service $APP --hostname=$APP_HOST"
review:
<<: *deploy
stage: review
variables:
APP: $CI_BUILD_REF_NAME
APP_HOST: $CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
environment:
name: review/$CI_BUILD_REF_NAME
url: http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
on_stop: stop-review
only:
- branches
except:
- master
stop-review:
<<: *deploy
stage: review
script:
- oc delete all -l "app=$APP"
when: manual
variables:
APP: $CI_BUILD_REF_NAME
GIT_STRATEGY: none
environment:
name: review/$CI_BUILD_REF_NAME
action: stop
only:
- branches
except:
- master
staging:
<<: *deploy
stage: staging
variables:
APP: staging
APP_HOST: $CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
environment:
name: staging
url: http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
only:
- master
production:
<<: *deploy
stage: production
variables:
APP: production
APP_HOST: $CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
when: manual
environment:
name: production
url: http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
only:
- master
# Explaination on the scripts:
# https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md
image: registry.gitlab.com/gitlab-examples/openshift-deploy image: registry.gitlab.com/gitlab-examples/openshift-deploy
variables: variables:
......
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