zidarsk8

zidar@dashie ~/programming/ggrc-core 
$ git grep "Copyright (C) 2017 Google Inc." . | grep -o "^[^:]*" | grep -v "^third_party" | sort -u > with_copyright 
zidar@dashie ~/programming/ggrc-core 
$ git ls-files | grep -v "^third_party" | sort > all_files 
zidar@dashie ~/programming/ggrc-core 
$ meld all_files with_copyright 
zidar@dashie ~/programming/ggrc-core 
$ diff all_files with_copyright | grep "^<" | wc -l

zidarsk8

zidar@dashie ~/programming/ggrc-core 
$ find . -type f ! -path "./.git/*" ! -path "./third_party/*" ! -path "*/vendor/*" ! -path "./without_copyright" | sort > without_copyright
zidar@dashie ~/programming/ggrc-core 
$ grep -r "Copyright (C)" . | grep -o "^[^:]*" | sort -u > with_copyright
zidar@dashie ~/programming/ggrc-core 
$ diff without_copyright with_copyright 

zidarsk8

$ git diff
diff --git a/src/ggrc/migrations/versions/20171110090511_4b9a43e7b623_fix_notes_data.py b/src/ggrc/migrations/versions/20171110090511_4b9a43e7b623_fix_notes_data.py
index 0641cdf12..fdec05214 100644
--- a/src/ggrc/migrations/versions/20171110090511_4b9a43e7b623_fix_notes_data.py
+++ b/src/ggrc/migrations/versions/20171110090511_4b9a43e7b623_fix_notes_data.py
@@ -18,6 +18,11 @@ revision = '4b9a43e7b623'
 down_revision = '33d043d8ba29'
 
 
+IGNORE_TABLES = {

zidarsk8

GGRC-1456,GGRC-1644,GGRC-1656,GGRC-2066,GGRC-2072,GGRC-2100,GGRC-2199,GGRC-2224,GGRC-2232,GGRC-2253,GGRC-2255,GGRC-2381,GGRC-2399,GGRC-2633,GGRC-2692,GGRC-2752,GGRC-2794,GGRC-2836,GGRC-2847,GGRC-2885,GGRC-2889,GGRC-2900,GGRC-2911,GGRC-2922,GGRC-2976,GGRC-2998,GGRC-2999,GGRC-3068,GGRC-3113,GGRC-3125,GGRC-3137,GGRC-3143,GGRC-3162,GGRC-3171,GGRC-3174,GGRC-3188,GGRC-3197,GGRC-3203,GGRC-3207,GGRC-3207,GGRC-3208,GGRC-3215,GGRC-3221,GGRC-3231,GGRC-3243,GGRC-3244,GGRC-3268,GGRC-3275,GGRC-3278,GGRC-3278,GGRC-3279,GGRC-3280,GGRC-3283,GGRC-3284,GGRC-3284,GGRC-3285,GGRC-3286,GGRC-3287,GGRC-3295,GGRC-3296,GGRC-3299,GGRC-3370,GGRC-3376,GGRC-3377,GGRC-3378,GGRC-3404,GGRC-3252,GGRC-3177

GGRC-3252
GGRC-3177
GGRC-1456
GGRC-1644
GGRC-1656
GGRC-2066
GGRC-2072

zidarsk8

curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
sudo apt-get update
apt-cache policy docker-ce
sudo apt-get install docker docker-ce -y
sudo curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
sudo usermod -aG docker mihaz
# logut login
docker ps -a

zidarsk8

#!/usr/bin/env bash

set -o errexit
set -o nounset

SERVICE="${1}"
DEPLOY_PREFIX="extras/deploy"

source "$DEPLOY_PREFIX/$SERVICE/db_move"
# OLD_DB_INSTANCE_ID="ggrc-perf-db"

zidarsk8

diff --git a/src/ggrc/assets/javascripts/components/assessment/info-pane/info-pane.js b/src/ggrc/assets/javascripts/components/assessment/info-pane/info-pane.js
index 2197432da..6d97098c5 100644
--- a/src/ggrc/assets/javascripts/components/assessment/info-pane/info-pane.js
+++ b/src/ggrc/assets/javascripts/components/assessment/info-pane/info-pane.js
@@ -190,10 +190,33 @@
           .replace(this.loadUrls());
       },
       initializeFormFields: function () {
+        var cads = this.attr('instance.custom_attribute_definitions');
+        var cavs = this.attr('instance.custom_attribute_values');

zidarsk8

[
    {
        "control":{
            "selected":false,
            "title":"uoauo",
            "slug":"",
            "description":"",
            "url":"",
            "status":"Draft",
            "_pending_joins":[

zidarsk8

diff --git a/src/ggrc/access_control/roleable.py b/src/ggrc/access_control/roleable.py
index 0cfcab6f5..d25ec631f 100644
--- a/src/ggrc/access_control/roleable.py
+++ b/src/ggrc/access_control/roleable.py
@@ -42,28 +42,6 @@ class Roleable(object):
   def access_control_list(self):
     return self._access_control_list
 
-  def _remove_existing(self, existing, values):
-    """Helper function for removing existing items in acl"""

zidarsk8

diff --git a/src/ggrc/assets/javascripts/models/cacheable.js b/src/ggrc/assets/javascripts/models/cacheable.js
index 4fd64c8b7..693e051dc 100644
--- a/src/ggrc/assets/javascripts/models/cacheable.js
+++ b/src/ggrc/assets/javascripts/models/cacheable.js
@@ -121,7 +121,7 @@
       {
         attr_title: 'Owner',
         attr_name: 'owner',
-        attr_sort_field: 'contact.name|email',
+        attr_sort_field: 'owners',