Updated cap file

This commit is contained in:
mcmac 2018-02-27 15:45:56 +00:00
parent c23ff6aca3
commit e9656fc551
7 changed files with 118 additions and 55 deletions

2
.idea/.generators generated
View file

@ -5,4 +5,4 @@ You are allowed to:
2. Remove generators 2. Remove generators
3. Add installed generators 3. Add installed generators
To add new installed generators automatically delete this file and reload the project. To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="channel" /><Generator name="controller" /><Generator name="generator" /><Generator name="integration_test" /><Generator name="job" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /></GeneratorsGroup></Settings> --><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="channel" /><Generator name="controller" /><Generator name="factory_girl:model" /><Generator name="generator" /><Generator name="integration_test" /><Generator name="job" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="resource" /><Generator name="rspec:controller" /><Generator name="rspec:feature" /><Generator name="rspec:helper" /><Generator name="rspec:install" /><Generator name="rspec:integration" /><Generator name="rspec:job" /><Generator name="rspec:mailer" /><Generator name="rspec:model" /><Generator name="rspec:observer" /><Generator name="rspec:request" /><Generator name="rspec:scaffold" /><Generator name="rspec:view" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /></GeneratorsGroup></Settings>

2
.idea/.rakeTasks generated

File diff suppressed because one or more lines are too long

32
.idea/vereto-api.iml generated
View file

@ -33,16 +33,30 @@
<orderEntry type="library" scope="PROVIDED" name="activemodel (v5.1.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="activemodel (v5.1.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activerecord (v5.1.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="activerecord (v5.1.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="activesupport (v5.1.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="activesupport (v5.1.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="airbrussh (v1.3.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="arel (v8.0.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="arel (v8.0.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.1, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="byebug (v10.0.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="byebug (v10.0.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capistrano (v3.10.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capistrano-bundler (v1.3.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capistrano-passenger (v0.2.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capistrano-rails (v1.3.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="capistrano-rbenv (v2.1.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="crass (v1.0.3, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="crass (v1.0.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.6.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="erubi (v1.7.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="erubi (v1.7.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.21, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.9.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.9.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="faker (v1.8.7, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="fast_jsonapi (v1.0.17, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.23, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.1, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="i18n (v0.9.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="i18n (v0.9.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="jwt (v2.1.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="listen (v3.1.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="listen (v3.1.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="loofah (v2.2.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="loofah (v2.2.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mail (v2.7.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.0, rbenv: 2.5.0) [gem]" level="application" />
@ -50,11 +64,17 @@
<orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.3.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.3.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="minitest (v5.11.3, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="minitest (v5.11.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.13.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.4.10, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="net-scp (v1.2.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="net-ssh (v4.2.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="nio4r (v2.2.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="nio4r (v2.2.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.8.2, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.8.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="oj (v3.4.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="puma (v3.11.2, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="puma (v3.11.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack (v2.0.4, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rack (v2.0.4, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.8.2, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rack-cors (v1.0.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rack-test (v0.8.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails (v5.1.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rails (v5.1.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.3, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.3, rbenv: 2.5.0) [gem]" level="application" />
@ -62,16 +82,24 @@
<orderEntry type="library" scope="PROVIDED" name="rake (v12.3.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rake (v12.3.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.2, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.9.10, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.9.10, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.7.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.7.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.7.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.7.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.7.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="ruby_dep (v1.5.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="ruby_dep (v1.5.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="shoulda-matchers (v3.1.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="spring (v2.0.2, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="spring (v2.0.2, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="spring-watcher-listen (v2.0.1, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="spring-watcher-listen (v2.0.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.1, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sshkit (v1.16.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thor (v0.20.0, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="thor (v0.20.0, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.6.5, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.6.5, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.3, rbenv: 2.5.0) [gem]" level="application" /> <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.3, rbenv: 2.5.0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="will_paginate (v3.1.6, rbenv: 2.5.0) [gem]" level="application" />
</component> </component>
<component name="RModuleSettingsStorage"> <component name="RModuleSettingsStorage">
<LOAD_PATH number="0" /> <LOAD_PATH number="0" />

100
.idea/workspace.xml generated
View file

@ -2,8 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="42443dfa-4405-4cad-b0d1-6c57eb86e644" name="Default" comment=""> <list default="true" id="42443dfa-4405-4cad-b0d1-6c57eb86e644" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/Capfile" afterPath="$PROJECT_DIR$/Capfile" /> <change beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
<change beforePath="$PROJECT_DIR$/.idea/.rakeTasks" afterPath="$PROJECT_DIR$/.idea/.rakeTasks" />
<change beforePath="$PROJECT_DIR$/.idea/vereto-api.iml" afterPath="$PROJECT_DIR$/.idea/vereto-api.iml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" /> <change beforePath="$PROJECT_DIR$/Gemfile" afterPath="$PROJECT_DIR$/Gemfile" />
<change beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
<change beforePath="$PROJECT_DIR$/config/deploy.rb" afterPath="$PROJECT_DIR$/config/deploy.rb" />
</list> </list>
<ignored path="$PROJECT_DIR$/.bundle/" /> <ignored path="$PROJECT_DIR$/.bundle/" />
<ignored path="$PROJECT_DIR$/components/" /> <ignored path="$PROJECT_DIR$/components/" />
@ -32,16 +37,6 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="seeds.rb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/db/seeds.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="13" column="34" lean-forward="false" selection-start-line="13" selection-start-column="34" selection-end-line="13" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="article.rb" pinned="false" current-in-tab="false"> <file leaf-file-name="article.rb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/models/article.rb"> <entry file="file://$PROJECT_DIR$/app/models/article.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -65,11 +60,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Gemfile" pinned="false" current-in-tab="true"> <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Gemfile"> <entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483"> <state relative-caret-position="231">
<caret line="28" column="16" lean-forward="false" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" /> <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -89,17 +84,27 @@
<entry file="file://$PROJECT_DIR$/Capfile"> <entry file="file://$PROJECT_DIR$/Capfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162"> <state relative-caret-position="162">
<caret line="9" column="27" lean-forward="false" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" /> <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="deploy.rb" pinned="false" current-in-tab="false"> <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="46" column="22" lean-forward="false" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="deploy.rb" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/deploy.rb"> <entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="18">
<caret line="10" column="41" lean-forward="true" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" /> <caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -141,6 +146,7 @@
<findStrings> <findStrings>
<find>todos</find> <find>todos</find>
<find>todo</find> <find>todo</find>
<find>cap</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>article</replace> <replace>article</replace>
@ -199,10 +205,10 @@
<option value="$PROJECT_DIR$/app/models/article.rb" /> <option value="$PROJECT_DIR$/app/models/article.rb" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/config/database.yml" /> <option value="$PROJECT_DIR$/config/database.yml" />
<option value="$PROJECT_DIR$/config/deploy.rb" />
<option value="$PROJECT_DIR$/config/deploy/production.rb" /> <option value="$PROJECT_DIR$/config/deploy/production.rb" />
<option value="$PROJECT_DIR$/Capfile" /> <option value="$PROJECT_DIR$/Capfile" />
<option value="$PROJECT_DIR$/Gemfile" /> <option value="$PROJECT_DIR$/Gemfile" />
<option value="$PROJECT_DIR$/config/deploy.rb" />
</list> </list>
</option> </option>
</component> </component>
@ -417,35 +423,34 @@
<workItem from="1519290005411" duration="14967000" /> <workItem from="1519290005411" duration="14967000" />
<workItem from="1519397128786" duration="1320000" /> <workItem from="1519397128786" duration="1320000" />
<workItem from="1519645932206" duration="665000" /> <workItem from="1519645932206" duration="665000" />
<workItem from="1519737843279" duration="3086000" /> <workItem from="1519737843279" duration="5589000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="71576000" /> <option name="totallyTimeSpent" value="74079000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-89" y="233" width="1920" height="1026" extended-state="6" /> <frame x="-89" y="233" width="1920" height="1026" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2013889" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2013889" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16899893" sideWeight="0.30341882" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25080732" sideWeight="0.30876067" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32959402" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32959402" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32938644" sideWeight="0.4957265" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16899893" sideWeight="0.6965812" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25080732" sideWeight="0.6912393" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -461,13 +466,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/spec/controllers/authentication_controller_spec.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/spec/requests/users_spec.rb"> <entry file="file://$PROJECT_DIR$/spec/requests/users_spec.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509"> <state relative-caret-position="509">
@ -720,14 +718,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/database.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="30" column="53" lean-forward="false" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/log/capistrano.log"> <entry file="file://$PROJECT_DIR$/log/capistrano.log">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2484"> <state relative-caret-position="-2484">
@ -760,10 +750,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/deploy.rb"> <entry file="file://$PROJECT_DIR$/config/database.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="540">
<caret line="10" column="41" lean-forward="true" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" /> <caret line="30" column="53" lean-forward="false" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Gemfile.lock">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="46" column="22" lean-forward="false" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -771,15 +769,23 @@
<entry file="file://$PROJECT_DIR$/Capfile"> <entry file="file://$PROJECT_DIR$/Capfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162"> <state relative-caret-position="162">
<caret line="9" column="27" lean-forward="false" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" /> <caret line="9" column="28" lean-forward="true" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Gemfile"> <entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483"> <state relative-caret-position="231">
<caret line="28" column="16" lean-forward="false" selection-start-line="28" selection-start-column="16" selection-end-line="28" selection-end-column="16" /> <caret line="23" column="19" lean-forward="true" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18">
<caret line="1" column="13" lean-forward="true" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View file

@ -22,7 +22,7 @@ gem 'jwt'
gem 'rack-cors', :require => 'rack/cors' gem 'rack-cors', :require => 'rack/cors'
gem 'fast_jsonapi' gem 'fast_jsonapi'
gem 'will_paginate' gem 'will_paginate'
gem 'capistrano', '~> 3.7', '>= 3.7.1' gem 'capistrano', '3.10.1'
gem 'capistrano-rails', '~> 1.2' gem 'capistrano-rails', '~> 1.2'
gem 'capistrano-passenger', '~> 0.2.0' gem 'capistrano-passenger', '~> 0.2.0'
gem 'capistrano-rbenv' gem 'capistrano-rbenv'

View file

@ -38,10 +38,28 @@ GEM
i18n (~> 0.7) i18n (~> 0.7)
minitest (~> 5.1) minitest (~> 5.1)
tzinfo (~> 1.1) tzinfo (~> 1.1)
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (8.0.0) arel (8.0.0)
bcrypt (3.1.11) bcrypt (3.1.11)
builder (3.2.3) builder (3.2.3)
byebug (10.0.0) byebug (10.0.0)
capistrano (3.10.1)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
sshkit (>= 1.9.0)
capistrano-bundler (1.3.0)
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
capistrano-rails (1.3.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rbenv (2.1.3)
capistrano (~> 3.1)
sshkit (~> 1.3)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
crass (1.0.3) crass (1.0.3)
database_cleaner (1.6.2) database_cleaner (1.6.2)
@ -59,7 +77,7 @@ GEM
activesupport (~> 5.0) activesupport (~> 5.0)
multi_json (~> 1.12) multi_json (~> 1.12)
oj (~> 3.3) oj (~> 3.3)
ffi (1.9.21) ffi (1.9.23)
globalid (0.4.1) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
i18n (0.9.5) i18n (0.9.5)
@ -80,6 +98,9 @@ GEM
minitest (5.11.3) minitest (5.11.3)
multi_json (1.13.1) multi_json (1.13.1)
mysql2 (0.4.10) mysql2 (0.4.10)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (4.2.0)
nio4r (2.2.0) nio4r (2.2.0)
nokogiri (1.8.2) nokogiri (1.8.2)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
@ -87,7 +108,7 @@ GEM
puma (3.11.2) puma (3.11.2)
rack (2.0.4) rack (2.0.4)
rack-cors (1.0.2) rack-cors (1.0.2)
rack-test (0.8.2) rack-test (0.8.3)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.1.5) rails (5.1.5)
actioncable (= 5.1.5) actioncable (= 5.1.5)
@ -148,6 +169,9 @@ GEM
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sshkit (1.16.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (0.20.0) thor (0.20.0)
thread_safe (0.3.6) thread_safe (0.3.6)
tzinfo (1.2.5) tzinfo (1.2.5)
@ -163,6 +187,11 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
byebug byebug
capistrano (= 3.10.1)
capistrano-bundler
capistrano-passenger (~> 0.2.0)
capistrano-rails (~> 1.2)
capistrano-rbenv
database_cleaner database_cleaner
factory_girl_rails (~> 4.0) factory_girl_rails (~> 4.0)
faker faker

View file

@ -1,5 +1,5 @@
# config valid only for current version of Capistrano # config valid only for current version of Capistrano
lock "3.8.1" lock "3.10.1"
set :application, "vereto-api" set :application, "vereto-api"
set :repo_url, "git@gogs.vereto.tech:PromoStarr/vereto-api.git" set :repo_url, "git@gogs.vereto.tech:PromoStarr/vereto-api.git"