From 3f157bec35d605ccbdb97312353850f935740f4a Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 21 Aug 2016 23:53:42 +0200 Subject: [PATCH 1/5] Prepare 0.7.0.0 cycle [ci skip] --- Changelog.md | 8 ++++++++ config/defaults.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 3bb06c364..2d13a0d7b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,11 @@ +# 0.7.0.0 + +## Refactor + +## Bug fixes + +## Features + # 0.6.1.0 ## Refactor diff --git a/config/defaults.yml b/config/defaults.yml index 57e6c6f57..2461718be 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,7 +4,7 @@ defaults: version: - number: "0.6.0.99" # Do not touch unless doing a release, do not backport the version number that's in master + number: "0.6.99.0" # Do not touch unless doing a release, do not backport the version number that's in master heroku: false environment: url: "http://localhost:3000/" From 395751ee1f6e39f2a5f751ba8e4c44fde54a90b0 Mon Sep 17 00:00:00 2001 From: lislis Date: Tue, 30 Aug 2016 12:38:03 +0200 Subject: [PATCH 2/5] update the `bug` link in the sidebar to the report bug wiki page --- app/views/streams/main_stream.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml index 46f71957d..ed210d185 100644 --- a/app/views/streams/main_stream.html.haml +++ b/app/views/streams/main_stream.html.haml @@ -81,8 +81,8 @@ tag_path(name: t("aspects.index.help.tag_question")))) %li != t("aspects.index.help.find_a_bug", - link: link_to("#" + t("aspects.index.help.tag_bug"), - tag_path(name: t("aspects.index.help.tag_bug")))) + link: link_to(t("aspects.index.help.tag_bug"), + "https://wiki.diasporafoundation.org/How_to_report_a_bug")) %li != t("aspects.index.help.feature_suggestion", link: link_to("#" + t("aspects.index.help.tag_feature"), From c6858d62a362c1d7b971b513672d61eddd4790c0 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 5 Sep 2016 20:56:04 +0200 Subject: [PATCH 3/5] Add missing sidebar background in contacts tab closes #7064 --- Changelog.md | 1 + app/views/people/contacts.haml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 50732375d..d8a621257 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,6 +12,7 @@ * Closed accounts will no longer show up in the account search [#7042](https://github.com/diaspora/diaspora/pull/7042) * Code blocks in conversations no longer overflow the content [#7055](https://github.com/diaspora/diaspora/pull/7055) * More buttons in mobile streams are fixed [#7036](https://github.com/diaspora/diaspora/pull/7036) +* Fixed missing sidebar background in the contacts tab [#7064](https://github.com/diaspora/diaspora/pull/7064) ## Features * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml index 34da88215..489f0eb17 100644 --- a/app/views/people/contacts.haml +++ b/app/views/people/contacts.haml @@ -4,7 +4,7 @@ .container-fluid#profile_container .row .col-md-3 - #profile + .sidebar.profile-sidebar#profile -# here be JS .col-md-9 From 56aec9a9780fd16e159890b03a8f8fc3327ba4d0 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 12 Sep 2016 10:48:46 +0200 Subject: [PATCH 4/5] Require installed optional groups with Bundler --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 6ef69fdb5..ca30da275 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,7 +1,7 @@ require_relative 'boot' require 'rails/all' -Bundler.require(:default, Rails.env) +Bundler.require(:default, *Bundler.settings.with, Rails.env) # Do not dump the limit of boolean fields on MySQL, # since that generates a db/schema.rb that's incompatible From a3fd949df71ce509fb3f6dda46bc6e8979eb9b99 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Mon, 12 Sep 2016 10:51:07 +0200 Subject: [PATCH 5/5] Revert "Use bundler 1.12.5 on travis" This reverts commit 5fcc239d7cc35173835ea8cc0ee116fdd798caa1. --- .travis.yml | 2 +- script/ci/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 697996c13..1bcd8421a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ branches: - 'develop' before_install: - - gem install bundler --version 1.12.5 + - gem install bundler - mkdir travis-phantomjs - wget http://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs diff --git a/script/ci/build.sh b/script/ci/build.sh index d07e45c8e..7a129f211 100755 --- a/script/ci/build.sh +++ b/script/ci/build.sh @@ -8,6 +8,6 @@ if [ "$DB" = "mysql" ]; then sed -i 's/*common/*mysql/' config/database.yml fi -command="bundle _1.12.5_ exec rake --trace ci:travis:${BUILD_TYPE}" +command="bundle exec rake --trace ci:travis:${BUILD_TYPE}" exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command