diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-20 06:53:05 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-20 06:53:05 +0300 |
| commit | 9e9ce95d62ec4feb76c3ec238dd3189c781f40ce (patch) | |
| tree | 28939e566ce29a278cd7ae15e37266aa6a16a17c /Gemfile.lock | |
| parent | 76aad9b76ed756ca9ba2cbcdb399c815e542b3ae (diff) | |
| parent | de040ffaaef4ad5ebd93b3f7a237add438dbddd5 (diff) | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1cd7caa782d..2e3dc252a09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,6 +47,9 @@ GEM astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) attr_required (1.0.0) + autoprefixer-rails (5.1.6) + execjs + json awesome_print (1.2.0) axiom-types (0.0.5) descendants_tracker (~> 0.0.1) @@ -57,8 +60,9 @@ GEM erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.0.3.0) - sass (~> 3.2) + bootstrap-sass (3.3.3) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) browser (0.7.2) builder (3.2.2) cal-heatmap-rails (0.0.1) |