Skip to content

Commit

Permalink
Merge pull request #56 from omu/dev
Browse files Browse the repository at this point in the history
Update master from dev
  • Loading branch information
huseyin authored Nov 17, 2018
2 parents 88bfaeb + 1159f2e commit 7c780bf
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
docker: &docker
docker:
- image: circleci/ruby:2.5.1-node-browsers
- image: circleci/ruby:2.5.3-node-browsers
environment:
TZ: '/usr/share/zoneinfo/Asia/Istanbul'
RAILS_ENV: beta
Expand Down Expand Up @@ -87,4 +87,4 @@ workflows:
- karma
filters:
branches:
only: master
only: master
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.1
2.5.3
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'
ruby '2.5.3'

gem 'active_model_serializers'
gem 'bootsnap', '>= 1.1.0', require: false
Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.10.7)
active_model_serializers (0.10.8)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
case_transform (>= 0.2)
Expand Down Expand Up @@ -74,7 +74,7 @@ GEM
coderay (1.1.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.3)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
Expand All @@ -101,14 +101,14 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.0)
method_source (0.9.1)
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
Expand All @@ -120,18 +120,18 @@ GEM
mini_portile2 (~> 2.3.0)
nori (2.6.0)
parallel (1.12.1)
parser (2.5.1.2)
parser (2.5.3.0)
ast (~> 2.4.0)
pg (0.18.4)
powerpack (0.1.2)
pry (0.11.3)
pry (0.12.0)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry-rails (0.3.7)
pry (>= 0.10.4)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.5)
rack (2.0.6)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
Expand Down Expand Up @@ -170,14 +170,14 @@ GEM
rainbow (>= 2.0, < 4.0)
rollbar (2.18.0)
multi_json
rubocop (0.59.2)
rubocop (0.60.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
unicode-display_width (~> 1.4.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
Expand All @@ -197,7 +197,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
Expand Down Expand Up @@ -247,7 +247,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 2.5.1p57
ruby 2.5.3p105

BUNDLED WITH
1.16.6
1.17.1
6 changes: 3 additions & 3 deletions app/controllers/kps/verifications_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ class VerificationsController < ApplicationController

def identities
render_as_json @verifications.identities(
id_number: identities_params.require(:id_number),
first_name: identities_params.require(:first_name),
last_name: identities_params.require(:last_name),
id_number: identities_params.require(:id_number),
first_name: identities_params.require(:first_name),
last_name: identities_params.require(:last_name),
year_of_birth: identities_params.require(:year_of_birth)
)
end
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/osym/examination_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ def groups
def result_informations
render_as_json @examination.result_informations(
id_number: secure_params.require(:id_number),
year: secure_params.require(:year),
group_id: secure_params.require(:group_id)
year: secure_params.require(:year),
group_id: secure_params.require(:group_id)
)
end

Expand Down
2 changes: 1 addition & 1 deletion app/services/lib/services/osym/examination.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def initialize(username, password)
WSDL_URL,
savon_options: {
basic_auth: [username, password],
wsse_auth: [username, password]
wsse_auth: [username, password]
}
)
end
Expand Down
Binary file modified doc/development/img/application.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/development/img/architecture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7c780bf

Please sign in to comment.