Merge pull request #3665 from dart-lang/git-status

Git status Merge pull request #3677 from dart-lang/reenable-git-salt-flag Re-enable git-salt behind a flag.
googlearchive · Nov 19, 2014 · 85f1ffc · 85f1ffc
1 parent f3e0277
commit 85f1ffc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ide/web/lib/spark_flags.dart b/ide/web/lib/spark_flags.dart
@@ -68,8 +68,8 @@ class SparkFlags {
   // Git:
   static bool get gitPull =>
       _flags['enable-git-pull'] == true;
-  static bool get gitSalt => false;
-      //_flags['enable-git-salt'] == true;
+  static bool get gitSalt =>
+      _flags['enable-git-salt'] == true;
 
   static bool get polymerDesigner =>
       _flags['enable-polymer-designer'] == true;

diff --git a/ide/web/spark_polymer.html b/ide/web/spark_polymer.html
@@ -152,6 +152,7 @@
   <script type="application/javascript" src="lib/mobile/android_rsa.js"></script>
   <script type="application/javascript" src="third_party/wam/wam_fs.concat.js"></script>
   <script type="application/javascript" src="lib/wam/wamfs.js"></script>
+  <script type="application/javascript" src="lib/git_salt/git_salt.js"></script>
 
   <!-- Start Spark in a deployed build. -->
   <script type="application/dart" src="spark_polymer.dart"></script>