remote: Counting objects: 56, done.
remote: Compressing objects: 100% (54/54), done.
remote: Total 56 (delta 12), reused 0 (delta 0)
Unpacking objects: 100% (56/56), done.
From github.com:4Soft/iglesiasapi
 * branch            iss7       -> FETCH_HEAD
   3b89142..e27c1c2  iss7       -> origin/iss7
Updating 3b89142..e27c1c2
Fast-forward
 app/controllers/application_controller.rb                 |  44 -------------------
 app/controllers/doormen_controller.rb                     |  74 -------------------------------
 app/controllers/gallery_controller.rb                     |  41 ------------------
 app/controllers/jobs_controller.rb                        |  78 ---------------------------------
 app/controllers/negotiations_controller.rb                |  32 --------------
 app/controllers/people_controller.rb                      |  89 --------------------------------------
 app/controllers/real_states_controller.rb                 |  85 ------------------------------------
 app/controllers1/activities_controller.rb                 |  79 ++++++++++++++++++++++++++++++++++
 app/{controllers => controllers1}/addresses_controller.rb |   0
 app/controllers1/application_controller.rb                |  31 +++++++++++++
 app/controllers1/areas_controller.rb                      |  86 ++++++++++++++++++++++++++++++++++++
 app/controllers1/charters_controller.rb                   |  93 +++++++++++++++++++++++++++++++++++++++
 app/controllers1/clients_controller.rb                    |  89 ++++++++++++++++++++++++++++++++++++++
 app/{controllers => controllers1}/concerns/.keep          |   0
 app/controllers1/contact_phones_controller.rb             |  60 ++++++++++++++++++++++++++
app/controllers1/model_charters_controller.rb             |  75 ++++++++++++++++++++++++++++++++
 app/controllers1/proposals_controller.rb                  | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/controllers1/requests_controller.rb                   |  84 ++++++++++++++++++++++++++++++++++++
 app/controllers1/service_items_controller.rb              |  84 ++++++++++++++++++++++++++++++++++++
 app/controllers1/services_controller.rb                   |  98 +++++++++++++++++++++++++++++++++++++++++
 app/controllers1/users_controller.rb                      |  81 ++++++++++++++++++++++++++++++++++
 app/decorators/user_decorator.rb                          |  13 ++++++
 app/helpers/users_helper.rb                               |   2 +
 app/views/users/_form.html.erb                            |  16 +++++++
 app/views/users/_user.html.erb                            |   6 +++
 app/views/users/edit.html.erb                             |   6 +++
 app/views/users/index.html.erb                            |  23 ++++++++++
 app/views/users/index.json.jbuilder                       |   4 ++
 app/views/users/new.html.erb                              |   5 +++
 app/views/users/show.html.erb                             |   9 ++++
 app/views/users/show.json.jbuilder                        |   1 +
 config/routes.rb                                          |  23 +++++-----
 db/migrate/20140922002513_devise_create_users.rb          |   2 +-
 db/schema.rb                                              |   1 +
 spec/controllers/users_controller_spec.rb                 | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 spec/decorators/user_decorator_spec.rb                    |   4 ++
 spec/helpers/users_helper_spec.rb                         |  15 +++++++
 spec/requests/users_spec.rb                               |  11 +++++
 spec/routing/users_routing_spec.rb                        |  35 +++++++++++++++
 spec/views/users/edit.html.erb_spec.rb                    |  15 +++++++
 spec/views/users/index.html.erb_spec.rb                   |  15 +++++++
 spec/views/users/new.html.erb_spec.rb                     |  15 +++++++
 spec/views/users/show.html.erb_spec.rb                    |  12 ++++++
 43 files changed, 1495 insertions(+), 457 deletions(-)
 delete mode 100644 app/controllers/application_controller.rb
 delete mode 100644 app/controllers/doormen_controller.rb
delete mode 100644 app/controllers/gallery_controller.rb
 delete mode 100644 app/controllers/jobs_controller.rb
 delete mode 100644 app/controllers/negotiations_controller.rb
 delete mode 100644 app/controllers/people_controller.rb
 delete mode 100644 app/controllers/real_states_controller.rb
 create mode 100644 app/controllers1/activities_controller.rb
 rename app/{controllers => controllers1}/addresses_controller.rb (100%)
 create mode 100644 app/controllers1/application_controller.rb
 create mode 100644 app/controllers1/areas_controller.rb
 create mode 100644 app/controllers1/charters_controller.rb
 create mode 100644 app/controllers1/clients_controller.rb
 rename app/{controllers => controllers1}/concerns/.keep (100%)
 create mode 100644 app/controllers1/contact_phones_controller.rb
 create mode 100644 app/controllers1/model_charters_controller.rb
 create mode 100644 app/controllers1/proposals_controller.rb
 create mode 100644 app/controllers1/requests_controller.rb
 create mode 100644 app/controllers1/service_items_controller.rb
 create mode 100644 app/controllers1/services_controller.rb
 create mode 100644 app/controllers1/users_controller.rb
 create mode 100644 app/decorators/user_decorator.rb
 create mode 100644 app/helpers/users_helper.rb
 create mode 100644 app/views/users/_form.html.erb
 create mode 100644 app/views/users/_user.html.erb
 create mode 100644 app/views/users/edit.html.erb
 create mode 100644 app/views/users/index.html.erb
 create mode 100644 app/views/users/index.json.jbuilder
 create mode 100644 app/views/users/new.html.erb
 create mode 100644 app/views/users/show.html.erb
 create mode 100644 app/views/users/show.json.jbuilder
 create mode 100644 spec/controllers/users_controller_spec.rb
 create mode 100644 spec/decorators/user_decorator_spec.rb
 create mode 100644 spec/requests/users_spec.rb
 create mode 100644 spec/routing/users_routing_spec.rb
 create mode 100644 spec/views/users/edit.html.erb_spec.rb
 create mode 100644 spec/views/users/index.html.erb_spec.rb
 create mode 100644 spec/views/users/new.html.erb_spec.rb
 create mode 100644 spec/views/users/show.html.erb_spec.rb