Merge branch 'master' into minimize-on-diff
Showing
... | @@ -50,7 +50,7 @@ gem "browser", '~> 1.0.0' | ... | @@ -50,7 +50,7 @@ gem "browser", '~> 1.0.0' |
# Extracting information from a git repository | # Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | # Provide access to Gitlab::Git library | ||
gem "gitlab_git", '~> 8.1' | gem "gitlab_git", '~> 8.2' | ||
# LDAP Auth | # LDAP Auth | ||
# GitLab fork with several improvements to original library. For full list of changes | # GitLab fork with several improvements to original library. For full list of changes | ||
... | @@ -112,7 +112,7 @@ gem 'diffy', '~> 3.0.3' | ... | @@ -112,7 +112,7 @@ gem 'diffy', '~> 3.0.3' |
# Application server | # Application server | ||
group :unicorn do | group :unicorn do | ||
gem "unicorn", '~> 4.8.2' | gem "unicorn", '~> 4.9.0' | ||
gem 'unicorn-worker-killer', '~> 0.4.2' | gem 'unicorn-worker-killer', '~> 0.4.2' | ||
end | end | ||
... | @@ -204,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' | ... | @@ -204,7 +204,7 @@ 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' | ||
gem 'font-awesome-rails', '~> 4.2' | gem 'font-awesome-rails', '~> 4.2' | ||
gem 'gitlab_emoji', '~> 0.2.0' | gem 'gitlab_emoji', '~> 0.3.0' | ||
gem 'gon', '~> 6.0.1' | gem 'gon', '~> 6.0.1' | ||
gem 'jquery-atwho-rails', '~> 1.3.2' | gem 'jquery-atwho-rails', '~> 1.3.2' | ||
gem 'jquery-rails', '~> 4.0.0' | gem 'jquery-rails', '~> 4.0.0' | ||
... | @@ -218,7 +218,7 @@ gem 'virtus', '~> 1.0.1' | ... | @@ -218,7 +218,7 @@ gem 'virtus', '~> 1.0.1' |
gem 'net-ssh', '~> 3.0.1' | gem 'net-ssh', '~> 3.0.1' | ||
# Sentry integration | # Sentry integration | ||
gem 'sentry-raven' | gem 'sentry-raven', '~> 0.15' | ||
# Metrics | # Metrics | ||
group :metrics do | group :metrics do | ||
... | @@ -303,6 +303,8 @@ group :production do | ... | @@ -303,6 +303,8 @@ group :production do |
gem "gitlab_meta", '7.0' | gem "gitlab_meta", '7.0' | ||
end | end | ||
gem "newrelic_rpm", '~> 3.14' | |||
gem 'octokit', '~> 3.8.0' | gem 'octokit', '~> 3.8.0' | ||
gem "mail_room", "~> 0.6.1" | gem "mail_room", "~> 0.6.1" | ||
... | ... |
![app/assets/images/emoji.png](https://lab.nexedi.com/tatuya/gitlab-ce/-/raw/9f0a71f4fe0eade788c1c722c70873b319492dbe/app/assets/images/emoji.png)
674 KB
This source diff could not be displayed because it is too large. You can view the blob instead.
app/finders/todos_finder.rb
0 → 100644
app/helpers/todos_helper.rb
0 → 100644
app/models/blob.rb
0 → 100644
app/models/todo.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/services/todo_service.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
config/newrelic.yml
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/api/runners.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/api/runners.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/saml/user.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
scripts/notify_slack.sh
0 → 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
File moved
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/factories/todos.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/lib/ci/status_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/models/blob_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/models/todo_spec.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.