Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
05d713be
Commit
05d713be
authored
Dec 04, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sidekiq-2.17.8' into 'master'
Sidekiq 2.17.8 See merge request !1277
parents
d7fa9952
18164afb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
CHANGELOG
CHANGELOG
+1
-0
Gemfile
Gemfile
+1
-1
Gemfile.lock
Gemfile.lock
+10
-10
No files found.
CHANGELOG
View file @
05d713be
...
...
@@ -18,6 +18,7 @@ v 7.6.0
-
-
- In the docker directory is a container template based on the Omnibus packages.
- Update Sidekiq to version 2.17.8
-
-
...
...
Gemfile
View file @
05d713be
...
...
@@ -112,7 +112,7 @@ gem "acts-as-taggable-on"
# Background jobs
gem
'
slim
'
gem
'
sinatra
'
,
require:
nil
gem
'
sidekiq
'
,
'2.17.
0
'
gem
'
sidekiq
'
,
'2.17.
8
'
# HTTP requests
gem
"
httparty
"
...
...
Gemfile.lock
View file @
05d713be
...
...
@@ -78,7 +78,7 @@ GEM
coffee-script-source (1.6.3)
colored (1.2)
colorize (0.5.8)
connection_pool (
1.2
.0)
connection_pool (
2.1
.0)
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
...
...
@@ -402,7 +402,7 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
redcarpet (3.1.2)
redis (3.
0.6
)
redis (3.
1.0
)
redis-actionpack (4.0.0)
actionpack (~> 4)
redis-rack (~> 1.5.0)
...
...
@@ -410,8 +410,8 @@ GEM
redis-activesupport (4.0.0)
activesupport (~> 4)
redis-store (~> 1.1.0)
redis-namespace (1.
4
.1)
redis (~> 3.0.4)
redis-namespace (1.
5
.1)
redis (~> 3.0
, >= 3.0
.4)
redis-rack (1.5.0)
rack (~> 1.5)
redis-store (~> 1.1.0)
...
...
@@ -470,12 +470,12 @@ GEM
sexp_processor (4.4.0)
shoulda-matchers (2.1.0)
activesupport (>= 3.0.0)
sidekiq (2.17.
0
)
celluloid (
>
= 0.15.2)
connection_pool (
>= 1.0
.0)
sidekiq (2.17.
8
)
celluloid (= 0.15.2)
connection_pool (
~> 2
.0)
json
redis (
>= 3.0.4
)
redis-namespace (
>= 1.3.1
)
redis (
~> 3.1
)
redis-namespace (
~> 1.3
)
simple_oauth (0.1.9)
simplecov (0.9.0)
docile (~> 1.1.0)
...
...
@@ -684,7 +684,7 @@ DEPENDENCIES
semantic-ui-sass (~> 0.16.1.0)
settingslogic
shoulda-matchers (~> 2.1.0)
sidekiq (= 2.17.
0
)
sidekiq (= 2.17.
8
)
simplecov
sinatra
six
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment