Merge pull request #1106 from kingcody/fix/line-endings

Awk34 · Awk34 · commit e14eaee5d1f7 · 2015-07-28T15:16:13.000-04:00
fix(app): ensure all files end with a newline
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -549,4 +549,4 @@ Closes #18, #17
 
 #### Features
 
-* **gen:** include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))
+* **gen:** include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))
diff --git a/app/templates/.buildignore b/app/templates/.buildignore
@@ -1 +1 @@
-*.coffee
+*.coffee
diff --git a/app/templates/.gitattributes b/app/templates/.gitattributes
@@ -1 +1 @@
-* text=auto
+* text=auto
diff --git a/app/templates/.jscs.json b/app/templates/.jscs.json
@@ -41,4 +41,4 @@
   },
   "validateLineBreaks": "LF",
   "validateParameterSeparator": ", "
-}
+}
diff --git a/app/templates/.travis.yml b/app/templates/.travis.yml
@@ -6,4 +6,4 @@ before_script:
   - npm install -g bower grunt-cli<% if (filters.sass) { %>
   - gem install sass<% } %>
   - bower install
-services: mongodb
+services: mongodb
diff --git a/app/templates/client/app/account(auth)/settings/settings(html).html b/app/templates/client/app/account(auth)/settings/settings(html).html
@@ -36,4 +36,4 @@ <h1>Change Password</h1>
       </form>
     </div>
   </div>
-</div>
+</div>
diff --git a/app/templates/client/app/admin(auth)/admin(coffee).coffee b/app/templates/client/app/admin(auth)/admin(coffee).coffee
@@ -12,4 +12,4 @@ angular.module '<%= scriptAppName %>'
     url: '/admin'
     templateUrl: 'app/admin/admin.html'
     controller: 'AdminCtrl'
-<% } %>
+<% } %>
diff --git a/app/templates/client/app/admin(auth)/admin(html).html b/app/templates/client/app/admin(auth)/admin(html).html
@@ -9,4 +9,4 @@
         <a ng-click="delete(user)" class="trash"><span class="glyphicon glyphicon-trash pull-right"></span></a>
     </li>
   </ul>
-</div>
+</div>
diff --git a/app/templates/client/app/admin(auth)/admin(less).less b/app/templates/client/app/admin(auth)/admin(less).less
@@ -1 +1 @@
-.trash { color:rgb(209, 91, 71); }
+.trash { color:rgb(209, 91, 71); }
diff --git a/app/templates/client/app/admin(auth)/admin(stylus).styl b/app/templates/client/app/admin(auth)/admin(stylus).styl
@@ -1,2 +1,2 @@
 .trash
-    color rgb(209, 91, 71)
+    color rgb(209, 91, 71)
diff --git a/app/templates/client/app/main/main(coffee).coffee b/app/templates/client/app/main/main(coffee).coffee
@@ -12,4 +12,4 @@ angular.module '<%= scriptAppName %>'
     url: '/'
     templateUrl: 'app/main/main.html'
     controller: 'MainCtrl'
-<% } %>
+<% } %>
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(css).css b/app/templates/client/components/modal(uibootstrap)/modal(css).css
@@ -20,4 +20,4 @@
 }
 .modal-danger .modal-header {
   background: #d9534f;
-}
+}
diff --git a/app/templates/client/components/modal(uibootstrap)/modal(html).html b/app/templates/client/components/modal(uibootstrap)/modal(html).html
@@ -8,4 +8,4 @@ <h4 ng-if="modal.title" ng-bind="modal.title" class="modal-title"></h4>
 </div>
 <div class="modal-footer">
   <button ng-repeat="button in modal.buttons" ng-class="button.classes" ng-click="button.click($event)" ng-bind="button.text" class="btn"></button>
-</div>
+</div>
diff --git a/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(coffee).coffee b/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(coffee).coffee
@@ -9,4 +9,4 @@ angular.module '<%= scriptAppName %>'
   require: 'ngModel'
   link: (scope, element, attrs, ngModel) ->
     element.on 'keydown', ->
-      ngModel.$setValidity 'mongoose', true
+      ngModel.$setValidity 'mongoose', true
diff --git a/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(js).js b/app/templates/client/components/mongoose-error(auth)/mongoose-error.directive(js).js
@@ -14,4 +14,4 @@ angular.module('<%= scriptAppName %>')
         });
       }
     };
-  });
+  });
diff --git a/app/templates/client/components/navbar/navbar(jade).jade b/app/templates/client/components/navbar/navbar(jade).jade
@@ -31,4 +31,4 @@ div.navbar.navbar-default.navbar-static-top(ng-controller='NavbarCtrl')
             span.glyphicon.glyphicon-cog
 
         li(ng-show='isLoggedIn()')
-          a(<% if (filters.uirouter) { %>ui-sref='logout'<% } else { %>href='/logout'<% } %>) Logout<% } %>
+          a(<% if (filters.uirouter) { %>ui-sref='logout'<% } else { %>href='/logout'<% } %>) Logout<% } %>
diff --git a/app/templates/client/components/navbar/navbar.controller(coffee).coffee b/app/templates/client/components/navbar/navbar.controller(coffee).coffee
@@ -12,4 +12,4 @@ angular.module '<%= scriptAppName %>'
   $scope.getCurrentUser = Auth.getCurrentUser<% } %><% if(!filters.uirouter) { %>
 
   $scope.isActive = (route) ->
-    route is $location.path()<% } %>
+    route is $location.path()<% } %>
diff --git a/app/templates/client/components/socket(socketio)/socket.mock(js).js b/app/templates/client/components/socket(socketio)/socket.mock(js).js
@@ -13,4 +13,4 @@ angular.module('socketMock', [])
       syncUpdates: function() {},
       unsyncUpdates: function() {}
     };
-  });
+  });
diff --git a/controller/index.js b/controller/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/decorator/index.js b/decorator/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/directive/index.js b/directive/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/factory/index.js b/factory/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/filter/index.js b/filter/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/generators/constant/index.js b/generators/constant/index.js
@@ -11,4 +11,4 @@ util.inherits(Generator, yeoman.generators.Base);
 
 Generator.prototype.deprecated = function deprecated() {
   this.log(chalk.yellow('This sub-generator is deprecated. \n'));
-};
+};
diff --git a/generators/deploy/index.js b/generators/deploy/index.js
@@ -12,4 +12,4 @@ util.inherits(Generator, yeoman.generators.NamedBase);
 Generator.prototype.deprecated = function deprecated() {
   this.log(chalk.yellow(chalk.bold('yo angular-fullstack:deploy') + ' is deprecated, instead use: \n') +
            chalk.green('yo angular-fullstack:heroku') + ' or ' + chalk.green('yo angular-fullstack:openshift'));
-};
+};
diff --git a/generators/readme.md b/generators/readme.md
@@ -1 +1 @@
-This folder is for deprecated generators only.
+This folder is for deprecated generators only.
diff --git a/generators/value/index.js b/generators/value/index.js
@@ -11,4 +11,4 @@ util.inherits(Generator, yeoman.generators.Base);
 
 Generator.prototype.deprecated = function deprecated() {
   this.log(chalk.yellow('This sub-generator is deprecated. \n'));
-};
+};
diff --git a/generators/view/index.js b/generators/view/index.js
@@ -11,4 +11,4 @@ util.inherits(Generator, yeoman.generators.Base);
 
 Generator.prototype.deprecated = function deprecated() {
   this.log(chalk.yellow('This sub-generator is deprecated. \n'));
-};
+};
diff --git a/openshift/USAGE b/openshift/USAGE
@@ -5,4 +5,4 @@ Example:
     yo angular-fullstack:openshift
 
     This will create:
-        a dist folder and initialize an openshift app
+        a dist folder and initialize an openshift app
diff --git a/provider/index.js b/provider/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/route/index.js b/route/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/scripts/sauce_connect_setup.sh b/scripts/sauce_connect_setup.sh
@@ -57,4 +57,4 @@ done
  
 unset SAUCE_CONNECT_PLATFORM SAUCE_TMP_DIR SC_DIR SC_DISTRIBUTION SC_READYFILE SC_LOGFILE SC_TUNNEL_ID
  
-popd
+popd
diff --git a/service/index.js b/service/index.js
@@ -7,4 +7,4 @@ var Generator = yeoman.generators.Base.extend({
   }
 });
 
-module.exports = Generator;
+module.exports = Generator;
diff --git a/test/fixtures/.yo-rc.json b/test/fixtures/.yo-rc.json
@@ -17,4 +17,4 @@
       "googleAuth": true
     }
   }
-}
+}
diff --git a/util.js b/util.js
@@ -137,4 +137,4 @@ function processDirectory (self, source, destination) {
       }
     }
   });
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -549,4 +549,4 @@ Closes #18, #17`
`549`	`549`
`550`	`550`	`#### Features`
`551`	`551`
`552`		`-* gen: include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))`
	`552`	`+* gen: include MongoDB as an option When selected, sets up database with Mongoose. Repl ([280cc84d](http://github.com/DaftMonk/generator-angular-fullstack/commit/280cc84d735c60b1c261540dceda34dd7f91c93c), closes [#2](http://github.com/DaftMonk/generator-angular-fullstack/issues/2))`
-Original file line number
+Diff line change
       </form>
     </div>
   </div>
 -</div>
 +</div>
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-.trash { color:rgb(209, 91, 71); }`
	`1`	`+.trash { color:rgb(209, 91, 71); }`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`.trash`
`2`		`- color rgb(209, 91, 71)`
	`2`	`+ color rgb(209, 91, 71)`