diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-02-04 12:25:21 -0800 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-02-04 12:25:21 -0800 |
| commit | 4a81edefa409fad691c5d84e6ccbfbe46a9f3ae2 (patch) | |
| tree | 35624a12126d6eeaa502b202bfd3fe4e3a8e2834 | |
| parent | b98b7e904b84d58d7f945569f51047149d1d4dda (diff) | |
| parent | e5a9950c344f5639ccc576b0510db6e225b67ad9 (diff) | |
| download | gitlab-ci-4a81edefa409fad691c5d84e6ccbfbe46a9f3ae2.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlab-ci
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/views/web_hooks/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 843f7eb..b2deb85 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -217,7 +217,7 @@ GEM activesupport (= 4.0.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.12.0) + raindrops (0.13.0) rake (10.3.2) rb-fsevent (0.9.3) rb-inotify (0.9.2) diff --git a/app/views/web_hooks/index.html.haml b/app/views/web_hooks/index.html.haml index 08943a5..8b94450 100644 --- a/app/views/web_hooks/index.html.haml +++ b/app/views/web_hooks/index.html.haml @@ -82,7 +82,7 @@ } } ], - "total_commits_count": 2, + "total_commits_count": 2 } } </code> |