Skip to content

Commit

Permalink
gitlab: 8.13.5 -> 8.15.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@fpletz
fpletz committed Jan 15, 2017
1 parent 5928e6d commit 6e079bd
Show file tree
Hide file tree
Showing 7 changed files with 462 additions and 298 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab-shell/default.nix
View file
@@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab }:

stdenv.mkDerivation rec {
version = "3.6.6";
version = "4.1.1";
name = "gitlab-shell-${version}";

srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif";
sha256 = "1i7dqs0csqcjwkvg8csz5f1zxy1inrzxzz3g9j618aldqxzjfgnr";
};

buildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab-workhorse/default.nix
View file
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitLab, git, go }:

stdenv.mkDerivation rec {
version = "0.8.5";
version = "1.2.1";
name = "gitlab-workhorse-${version}";

srcs = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr";
sha256 = "1z4iyymld3pssf1dwar0hy6c5hii79gk4k59mqj0mgy2k73405y0";
};

buildInputs = [ git go ];
Expand Down
60 changes: 32 additions & 28 deletions pkgs/applications/version-management/gitlab/Gemfile
View file
Expand Up @@ -22,17 +22,17 @@ gem 'doorkeeper', '~> 4.2.0'
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'
gem 'omniauth-azure-oauth2', '~> 0.0.6'
gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-cas3', '~> 1.1.2'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-gitlab', '~> 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.4.1'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-saml', '~> 1.7.0'
gem 'omniauth-shibboleth', '~> 1.2.0'
gem 'omniauth-twitter', '~> 1.2.0'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.2.0'
gem 'rack-oauth2', '~> 1.2.1'
gem 'jwt'

Expand Down Expand Up @@ -67,8 +67,8 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
gem 'github-linguist', '~> 4.7.0', require: 'linguist'

# API
gem 'grape', '~> 0.15.0'
gem 'grape-entity', '~> 0.4.2'
gem 'grape', '~> 0.18.0'
gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'

# Pagination
Expand All @@ -85,13 +85,15 @@ gem 'dropzonejs-rails', '~> 0.7.1'

# for backups
gem 'fog-aws', '~> 0.9'
gem 'fog-azure', '~> 0.0'
gem 'fog-core', '~> 1.40'
gem 'fog-google', '~> 0.5'
gem 'fog-local', '~> 0.3'
gem 'fog-google', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-rackspace', '~> 0.1.1'

# for Google storage
gem 'google-api-client', '~> 0.8.6'

# for aws storage
gem 'unf', '~> 0.1.4'

Expand All @@ -100,11 +102,11 @@ gem 'seed-fu', '~> 2.3.5'

# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
gem 'gitlab-markup', '~> 1.5.0'
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
gem 'gitlab-markup', '~> 1.5.1'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2'
gem 'rdoc', '~>3.6'
gem 'rdoc', '~> 4.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
Expand All @@ -117,7 +119,7 @@ gem 'truncato', '~> 0.7.8'
gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8'

# Diffs
gem 'diffy', '~> 3.0.3'
gem 'diffy', '~> 3.1.0'

# Application server
group :unicorn do
Expand All @@ -134,9 +136,10 @@ gem 'after_commit_queue', '~> 1.3.0'
gem 'acts-as-taggable-on', '~> 4.0'

# Background jobs
gem 'sidekiq', '~> 4.2'
gem 'sidekiq-cron', '~> 0.4.0'
gem 'sidekiq', '~> 4.2.7'
gem 'sidekiq-cron', '~> 0.4.4'
gem 'redis-namespace', '~> 1.5.2'
gem 'sidekiq-limit_fetch', '~> 3.4'

# HTTP requests
gem 'httparty', '~> 0.13.3'
Expand All @@ -152,7 +155,7 @@ gem 'settingslogic', '~> 2.0.9'
gem 'version_sorter', '~> 2.1.0'

# Cache
gem 'redis-rails', '~> 4.0.0'
gem 'redis-rails', '~> 5.0.1'

# Redis
gem 'redis', '~> 3.2'
Expand All @@ -161,21 +164,27 @@ gem 'connection_pool', '~> 2.0'
# HipChat integration
gem 'hipchat', '~> 1.5.0'

# JIRA integration
gem 'jira-ruby', '~> 1.1.2'

# Flowdock integration
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'

# Gemnasium integration
gem 'gemnasium-gitlab-service', '~> 0.2'

# Slack integration
gem 'slack-notifier', '~> 1.2.0'
gem 'slack-notifier', '~> 1.5.1'

# Asana integration
gem 'asana', '~> 0.4.0'

# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'

# Kubernetes integration
gem 'kubeclient', '~> 2.2.0'

# d3
gem 'd3_rails', '~> 3.5.0'

Expand All @@ -193,7 +202,7 @@ gem 'loofah', '~> 2.0.3'
gem 'licensee', '~> 8.0.0'

# Protect against bruteforcing
gem 'rack-attack', '~> 4.3.1'
gem 'rack-attack', '~> 4.4.1'

# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
Expand All @@ -214,8 +223,7 @@ gem 'chronic_duration', '~> 0.10.6'
gem 'sass-rails', '~> 5.0.6'
gem 'coffee-rails', '~> 4.1.0'
gem 'uglifier', '~> 2.7.2'
gem 'turbolinks', '~> 2.5.0'
gem 'jquery-turbolinks', '~> 2.1.0'
gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'

gem 'addressable', '~> 2.3.8'
gem 'bootstrap-sass', '~> 3.3.0'
Expand Down Expand Up @@ -257,22 +265,19 @@ group :development do
gem 'better_errors', '~> 1.0.1'
gem 'binding_of_caller', '~> 0.7.2'

# Docs generator
gem 'sdoc', '~> 0.3.20'

# thin instead webrick
gem 'thin', '~> 1.7.0'
end

group :development, :test do
gem 'byebug', '~> 8.2.1', platform: :mri
gem 'pry-byebug', '~> 3.4.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'

gem 'awesome_print', '~> 1.2.0', require: false
gem 'fuubar', '~> 2.0.0'

gem 'database_cleaner', '~> 1.5.0'
gem 'factory_girl_rails', '~> 4.6.0'
gem 'factory_girl_rails', '~> 4.7.0'
gem 'rspec-rails', '~> 3.5.0'
gem 'rspec-retry', '~> 0.4.5'
gem 'spinach-rails', '~> 0.2.1'
Expand Down Expand Up @@ -310,6 +315,8 @@ group :development, :test do
gem 'knapsack', '~> 1.11.0'

gem 'activerecord_sane_schema_dumper', '0.2'

gem 'stackprof', '~> 0.2.10'
end

group :test do
Expand All @@ -326,21 +333,18 @@ gem 'newrelic_rpm', '~> 3.16'

gem 'octokit', '~> 4.3.0'

gem 'mail_room', '~> 0.8.1'
gem 'mail_room', '~> 0.9.0'

gem 'email_reply_parser', '~> 0.5.8'
gem 'html2text'

gem 'ruby-prof', '~> 0.16.2'

## CI
gem 'activerecord-session_store', '~> 1.0.0'
gem 'nested_form', '~> 0.3.2'

# OAuth
gem 'oauth2', '~> 1.2.0'

# Soft deletion
gem 'paranoia', '~> 2.0'
gem 'paranoia', '~> 2.2'

# Health check
gem 'health_check', '~> 2.2.0'
Expand Down

0 comments on commit 6e079bd

Please sign in to comment.