chore: Merge branch 'dev'

Author: mydearxym

.travis.yml

@@ -7,7 +7,7 @@ node_js:
 - 10
 sudo: false
 addons:
-  postgresql: '9.4'
+  postgresql: '9.6'
 before_script:
 - MIX_ENV=test mix deps.get
 - nvm install 8.10 && nvm use 8.10

lib/groupher_server_web/router.ex

@@ -5,6 +5,11 @@ defmodule GroupherServerWeb.Router do
   use Plug.ErrorHandler
   use Sentry.Plug
 
+  # see https://github.com/sikanhe/apollo-tracing-elixir/issues/26
+  require Protocol
+  Protocol.derive(Jason.Encoder, ApolloTracing.Schema)
+  Protocol.derive(Jason.Encoder, ApolloTracing.Schema.Execution)
+
   pipeline :api do
     plug(:accepts, ["json"])
     plug(GroupherServerWeb.Context)
@@ -17,7 +22,7 @@ defmodule GroupherServerWeb.Router do
       "/",
       Absinthe.Plug.GraphiQL,
       schema: GroupherServerWeb.Schema,
-      # json_codec: Jason,
+      json_codec: Jason,
       pipeline: {ApolloTracing.Pipeline, :plug},
       interface: :playground,
       context: %{pubsub: GroupherServerWeb.Endpoint}

mix.exs

@@ -4,7 +4,7 @@ defmodule GroupherServer.Mixfile do
   def project do
     [
       app: :groupher_server,
-      version: "0.1.7",
+      version: "0.1.1",
       elixir: "~> 1.9",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -51,8 +51,8 @@ defmodule GroupherServer.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.4.1"},
-      {:phoenix_pubsub, "~> 1.1.1"},
+      {:phoenix, "~> 1.4.9"},
+      {:phoenix_pubsub, "~> 1.1.2"},
       {:phoenix_html, "~> 2.13.3"},
       {:ecto_sql, "~> 3.1.2"},
       {:phoenix_ecto, "~> 4.0"},
@@ -64,13 +64,9 @@ defmodule GroupherServer.Mixfile do
       {:absinthe, "~> 1.4.16"},
       {:absinthe_ecto, "~> 0.1.3"},
       # Plug support for Absinthe
-      # {:absinthe_plug, "~> 1.4.4"},
-      # treat parse error as status "200"
-      {:absinthe_plug, git: "https://github.com/mastani-stack/absinthe_plug", override: true},
+      {:absinthe_plug, "~> 1.4.6"},
       # Password hashing lib
       {:comeonin, "~> 5.1.1"},
-      # Argon2 password hashing algorithm
-      # {:argon2_elixir, "~> 1.2"},
       # CORS
       {:corsica, "~> 1.1.2"},
       {:tesla, "~> 0.10.0"},
@@ -80,8 +76,7 @@ defmodule GroupherServer.Mixfile do
        git: "https://github.com/mastani-stack/scrivener_ecto", branch: "dev", override: true},
       # {:scrivener_ecto, "~> 2.0.0"},
       {:guardian, "~> 1.0"},
-      # {:timex, "~> 3.5.0"},
-      {:timex, git: "https://github.com/coderplanets/timex", branch: "master", override: true},
+      {:timex, "~> 3.6.1"},
       {:dataloader, "~> 1.0.2"},
       {:mix_test_watch, "~> 0.9", only: :dev, runtime: false},
       {:ex_unit_notifier, "~> 0.1", only: :test},
@@ -109,9 +104,7 @@ defmodule GroupherServer.Mixfile do
   #
   # See the documentation for `Mix` for more info on aliases.
   defp aliases do
-    # test.watch is powerd by: https://github.com/lpil/mix-test.watch
     [
-      # "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/mock/user_seeds.exs"],
       "ecto.setup": ["ecto.create", "ecto.migrate"],
       "ecto.reset": ["ecto.drop", "ecto.setup"],
       test: ["ecto.create --quiet", "ecto.migrate", "test"],

mix.lock

@@ -1,7 +1,7 @@
 %{
   "absinthe": {:hex, :absinthe, "1.4.16", "0933e4d9f12652b12115d5709c0293a1bf78a22578032e9ad0dad4efee6b9eb1", [:mix], [{:dataloader, "~> 1.0.0", [hex: :dataloader, repo: "hexpm", optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
   "absinthe_ecto": {:hex, :absinthe_ecto, "0.1.3", "420b68129e79fe4571a4838904ba03e282330d335da47729ad52ffd7b8c5fcb1", [:mix], [{:absinthe, "~> 1.3.0 or ~> 1.4.0", [hex: :absinthe, repo: "hexpm", optional: false]}, {:ecto, ">= 0.0.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm"},
-  "absinthe_plug": {:git, "https://github.com/mastani-stack/absinthe_plug", "76dde0d99a0552e0557c1b147a4195e91168b261", []},
+  "absinthe_plug": {:hex, :absinthe_plug, "1.4.7", "939b6b9e1c7abc6b399a5b49faa690a1fbb55b195c670aa35783b14b08ccec7a", [:mix], [{:absinthe, "~> 1.4.11", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.2 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
   "apollo_tracing": {:hex, :apollo_tracing, "0.4.1", "210d20693f88bd133a55b04dc1d990ce68ce620a804773731faf180b8b85aa4e", [:mix], [{:absinthe, "~> 1.4", [hex: :absinthe, repo: "hexpm", optional: false]}, {:absinthe_plug, "~> 1.4", [hex: :absinthe_plug, repo: "hexpm", optional: true]}], "hexpm"},
   "argon2_elixir": {:hex, :argon2_elixir, "1.2.14", "0fc4bfbc1b7e459954987d3d2f3836befd72d63f3a355e3978f5005dd6e80816", [], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
   "bamboo": {:hex, :bamboo, "1.2.0", "8aebd24f7c606c32d0163c398004a11608ca1028182a169b2e527793bfab7561", [:mix], [{:hackney, ">= 1.13.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, ">= 1.5.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"},
@@ -68,7 +68,7 @@
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"},
   "telemetry": {:hex, :telemetry, "0.4.0", "8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab", [:rebar3], [], "hexpm"},
   "tesla": {:hex, :tesla, "0.10.0", "e588c7e7f1c0866c81eeed5c38f02a4a94d6309eede336c1e6ca08b0a95abd3f", [:mix], [{:exjsx, ">= 0.1.0", [hex: :exjsx, repo: "hexpm", optional: true]}, {:fuse, "~> 2.4", [hex: :fuse, repo: "hexpm", optional: true]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: true]}, {:ibrowse, "~> 4.2", [hex: :ibrowse, repo: "hexpm", optional: true]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:poison, ">= 1.0.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm"},
-  "timex": {:git, "https://github.com/coderplanets/timex", "2858eeabd44ff50568c38c23187ca972935ae533", [branch: "master"]},
+  "timex": {:hex, :timex, "3.6.1", "efdf56d0e67a6b956cc57774353b0329c8ab7726766a11547e529357ffdc1d56", [:mix], [{:combine, "~> 0.10", [hex: :combine, repo: "hexpm", optional: false]}, {:gettext, "~> 0.10", [hex: :gettext, repo: "hexpm", optional: false]}, {:tzdata, "~> 0.1.8 or ~> 0.5 or ~> 1.0.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm"},
   "tzdata": {:hex, :tzdata, "0.5.20", "304b9e98a02840fb32a43ec111ffbe517863c8566eb04a061f1c4dbb90b4d84c", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"},
   "unsafe": {:hex, :unsafe, "1.0.1", "a27e1874f72ee49312e0a9ec2e0b27924214a05e3ddac90e91727bc76f8613d8", [:mix], [], "hexpm"},

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coderplanets_server_commitizen",
-  "version": "0.1.1",
+  "version": "0.4.0",
   "main": "index.js",
   "directories": {
     "doc": "docs",