Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit19ea971

Browse files
committed
chore: Merge branch 'dev'
2 parents6e7b809 +0208f58 commit19ea971

File tree

6 files changed

+16
-18
lines changed

6 files changed

+16
-18
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ node_js:
77
-10
88
sudo:false
99
addons:
10-
postgresql:'9.4'
10+
postgresql:'9.6'
1111
before_script:
1212
-MIX_ENV=test mix deps.get
1313
-nvm install 8.10 && nvm use 8.10

‎lib/groupher_server_web/router.ex‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ defmodule GroupherServerWeb.Router do
55
usePlug.ErrorHandler
66
useSentry.Plug
77

8+
# see https://github.com/sikanhe/apollo-tracing-elixir/issues/26
9+
requireProtocol
10+
Protocol.derive(Jason.Encoder,ApolloTracing.Schema)
11+
Protocol.derive(Jason.Encoder,ApolloTracing.Schema.Execution)
12+
813
pipeline:apido
914
plug(:accepts,["json"])
1015
plug(GroupherServerWeb.Context)
@@ -17,7 +22,7 @@ defmodule GroupherServerWeb.Router do
1722
"/",
1823
Absinthe.Plug.GraphiQL,
1924
schema:GroupherServerWeb.Schema,
20-
#json_codec: Jason,
25+
json_codec:Jason,
2126
pipeline:{ApolloTracing.Pipeline,:plug},
2227
interface::playground,
2328
context:%{pubsub:GroupherServerWeb.Endpoint}

‎mix.exs‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defmodule GroupherServer.Mixfile do
44
defprojectdo
55
[
66
app::groupher_server,
7-
version:"0.1.7",
7+
version:"0.1.1",
88
elixir:"~> 1.9",
99
elixirc_paths:elixirc_paths(Mix.env()),
1010
compilers:[:phoenix,:gettext]++Mix.compilers(),
@@ -51,8 +51,8 @@ defmodule GroupherServer.Mixfile do
5151
# Type `mix help deps` for examples and options.
5252
defpdepsdo
5353
[
54-
{:phoenix,"~> 1.4.1"},
55-
{:phoenix_pubsub,"~> 1.1.1"},
54+
{:phoenix,"~> 1.4.9"},
55+
{:phoenix_pubsub,"~> 1.1.2"},
5656
{:phoenix_html,"~> 2.13.3"},
5757
{:ecto_sql,"~> 3.1.2"},
5858
{:phoenix_ecto,"~> 4.0"},
@@ -64,13 +64,9 @@ defmodule GroupherServer.Mixfile do
6464
{:absinthe,"~> 1.4.16"},
6565
{:absinthe_ecto,"~> 0.1.3"},
6666
# Plug support for Absinthe
67-
# {:absinthe_plug, "~> 1.4.4"},
68-
# treat parse error as status "200"
69-
{:absinthe_plug,git:"https://github.com/mastani-stack/absinthe_plug",override:true},
67+
{:absinthe_plug,"~> 1.4.6"},
7068
# Password hashing lib
7169
{:comeonin,"~> 5.1.1"},
72-
# Argon2 password hashing algorithm
73-
# {:argon2_elixir, "~> 1.2"},
7470
# CORS
7571
{:corsica,"~> 1.1.2"},
7672
{:tesla,"~> 0.10.0"},
@@ -80,8 +76,7 @@ defmodule GroupherServer.Mixfile do
8076
git:"https://github.com/mastani-stack/scrivener_ecto",branch:"dev",override:true},
8177
# {:scrivener_ecto, "~> 2.0.0"},
8278
{:guardian,"~> 1.0"},
83-
# {:timex, "~> 3.5.0"},
84-
{:timex,git:"https://github.com/coderplanets/timex",branch:"master",override:true},
79+
{:timex,"~> 3.6.1"},
8580
{:dataloader,"~> 1.0.2"},
8681
{:mix_test_watch,"~> 0.9",only::dev,runtime:false},
8782
{:ex_unit_notifier,"~> 0.1",only::test},
@@ -109,9 +104,7 @@ defmodule GroupherServer.Mixfile do
109104
#
110105
# See the documentation for `Mix` for more info on aliases.
111106
defpaliasesdo
112-
# test.watch is powerd by: https://github.com/lpil/mix-test.watch
113107
[
114-
# "ecto.setup": ["ecto.create", "ecto.migrate", "run priv/mock/user_seeds.exs"],
115108
"ecto.setup":["ecto.create","ecto.migrate"],
116109
"ecto.reset":["ecto.drop","ecto.setup"],
117110
test:["ecto.create --quiet","ecto.migrate","test"],

‎mix.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%{
22
"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"},
33
"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"},
4-
"absinthe_plug":{:git,"https://github.com/mastani-stack/absinthe_plug","76dde0d99a0552e0557c1b147a4195e91168b261",[]},
4+
"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"},
55
"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"},
66
"argon2_elixir":{:hex,:argon2_elixir,"1.2.14","0fc4bfbc1b7e459954987d3d2f3836befd72d63f3a355e3978f5005dd6e80816",[],[{:elixir_make,"~> 0.4",[hex::elixir_make,repo:"hexpm",optional:false]}],"hexpm"},
77
"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 @@
6868
"ssl_verify_fun":{:hex,:ssl_verify_fun,"1.1.4","f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b",[:make,:mix,:rebar3],[],"hexpm"},
6969
"telemetry":{:hex,:telemetry,"0.4.0","8339bee3fa8b91cb84d14c2935f8ecf399ccd87301ad6da6b71c09553834b2ab",[:rebar3],[],"hexpm"},
7070
"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"},
71-
"timex":{:git,"https://github.com/coderplanets/timex","2858eeabd44ff50568c38c23187ca972935ae533",[branch:"master"]},
71+
"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"},
7272
"tzdata":{:hex,:tzdata,"0.5.20","304b9e98a02840fb32a43ec111ffbe517863c8566eb04a061f1c4dbb90b4d84c",[:mix],[{:hackney,"~> 1.0",[hex::hackney,repo:"hexpm",optional:false]}],"hexpm"},
7373
"unicode_util_compat":{:hex,:unicode_util_compat,"0.4.1","d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd",[:rebar3],[],"hexpm"},
7474
"unsafe":{:hex,:unsafe,"1.0.1","a27e1874f72ee49312e0a9ec2e0b27924214a05e3ddac90e91727bc76f8613d8",[:mix],[],"hexpm"},

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"coderplanets_server_commitizen",
3-
"version":"0.1.1",
3+
"version":"0.4.0",
44
"main":"index.js",
55
"directories": {
66
"doc":"docs",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp