This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| -----BEGIN CERTIFICATE----- | |
| MIIGhTCCBW2gAwIBAgIRAK0nvarSxMXCpbrYq40S1y4wDQYJKoZIhvcNAQELBQAw | |
| gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO | |
| BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD | |
| VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg | |
| Q0EwHhcNMTQxMDIzMDAwMDAwWhcNMTUxMDIzMjM1OTU5WjBkMSEwHwYDVQQLExhE | |
| b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMSkw | |
| JwYDVQQDEyBwYXkuZG9uYXRlLnBlYWNlY29ycHMtZGV2LjE4Zi51czCCAiIwDQYJ | |
| KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJ6J96j1lLP+15446ttP48Tfp4fBK4M5 | |
| J/h4iTHiij4PscCPEWU/mhjiWkw8m4TGSquFIQXJ8uipdYuysrC09SApmRfLPZxB |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/contacts/data/DHS.yaml b/contacts/data/DHS.yaml | |
| index 7977981..2804dd3 100644 | |
| --- a/contacts/data/DHS.yaml | |
| +++ b/contacts/data/DHS.yaml | |
| @@ -24,8 +24,7 @@ departments: | |
| - National Records Center, FOIA/PA Office | |
| - P.O. Box 648010 | |
| - Lee's Summit, MO 64064-8010 | |
| - description: U.S. Citizenship and Immigration Services oversees immigration to the | |
| - United States. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.gitignore b/.gitignore | |
| index 0856a67..1c0630d 100644 | |
| --- a/.gitignore | |
| +++ b/.gitignore | |
| @@ -62,6 +62,7 @@ peacecorps/*/static/*/sass/neat | |
| local_settings.py | |
| peacecorps/media | |
| peacecorps/peacecorps/tests/gpg/random_seed | |
| +peacecorps/peacecorps/scripts/svg |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/peacecorps/peacecorps/fixtures/countries.yaml b/peacecorps/peacecorps/fixtures/countries.yaml | |
| index 23ee6d9..a8c3b0b 100644 | |
| --- a/peacecorps/peacecorps/fixtures/countries.yaml | |
| +++ b/peacecorps/peacecorps/fixtures/countries.yaml | |
| @@ -268,7 +268,7 @@ | |
| - fields: {code: KWT, name: Kuwait} | |
| model: peacecorps.country | |
| pk: 90 | |
| -- fields: {code: KGZ, name: Kyrgyzstan} | |
| +- fields: {code: KGZ, name: Kyrgyz Republic} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| vagrant@packer-debian-7:~/peacecorps-site/peacecorps/peacecorps/static/peacecorps$ npm install --dev | |
| npm WARN engine mocha@0.3.3: wanted: {"node":">= 0.4.x < 0.7.0"} (current: {"node":"0.10.35","npm":"1.4.28"}) | |
| npm WARN deprecated github-flavored-markdown@1.0.1: This project is long out of date. Use 'marked' instead. | |
| npm WARN deprecated tap-runner@0.0.7: this is merged into the 'tap' module now | |
| npm WARN deprecated tap-producer@0.0.1: this is merged into the 'tap' module now | |
| npm WARN deprecated tap-consumer@0.0.1: this is merged into the 'tap' module now | |
| npm WARN deprecated tap-results@0.0.2: this is merged into the 'tap' module now | |
| npm WARN deprecated tap-assert@0.0.10: this is merged into the 'tap' module now | |
| npm WARN engine koa@0.14.0: wanted: {"node":">= 0.11.13"} (current: {"node":"0.10.35","npm":"1.4.28"}) | |
| npm WARN deprecated es5-shim@2.0.5: Please update to the latest version; it overrides noncompliant native methods even in modern implementations |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/views/shared/_cart_properties.html.erb b/app/views/shared/_cart_properties.html.erb | |
| index 9f04e3d..1b8e98b 100644 | |
| --- a/app/views/shared/_cart_properties.html.erb | |
| +++ b/app/views/shared/_cart_properties.html.erb | |
| @@ -8,7 +8,8 @@ | |
| <%- unless cart.property_exclusions.include? property %> | |
| <tr class="cart_item_information"> | |
| <td class="results-list" align="left"> | |
| - <strong><%= property.underscore.humanize %></strong> | |
| + <strong><%= I18n.t('helpers.label.cart.' + property, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| module WorkflowHelper | |
| class ThreeStateWorkflow | |
| include Workflow | |
| workflow do | |
| state :pending | |
| state :accepted | |
| state :rejected | |
| end | |
| end | |
| class NCRWorfklow |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| module Ncr | |
| class ProposalsController < ApplicationController | |
| before_filter :authenticate_user! | |
| def new | |
| @proposal_form = Ncr::ProposalForm.new | |
| @form_url, @form_method = {action: "create"}, "post" | |
| approver = self.suggested_approver | |
| if approver | |
| @proposal_form.approver_email = approver.email_address |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/spec/policies/proposal_policy_spec.rb b/spec/policies/proposal_policy_spec.rb | |
| index 95b31b0..219004d 100644 | |
| --- a/spec/policies/proposal_policy_spec.rb | |
| +++ b/spec/policies/proposal_policy_spec.rb | |
| @@ -196,8 +196,7 @@ describe ProposalPolicy do | |
| it "allows a client admin to see unassociated requests that are inside its client scope" do | |
| proposal.update_attributes(client_data_type:'AbcCompany::SomethingApprovable') | |
| - user = proposal.approvers.first | |
| - user.client_slug = "abc_company" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| post '/login' do | |
| redirect '/login' and return unless params[:login].present? | |
| login = params[:login].strip | |
| @new_user = User.new | |
| if (user = User.where(email: login).first) and User.authenticate(user, params[:password]) | |
| if user.service.present? | |
| Event.blocked_email! login, user.service |