Merge branch 'errbit' into feature/upstream_merge

Andrey Subbota
2 parents 729b2c1b 30b7e5b6
Showing 135 changed files with 571 additions and 292 deletions Show diff stats
Gemfile
Gemfile.lock
README.md
app/assets/images/alerts/help.gif
app/assets/images/alerts/important.gif
app/assets/images/alerts/info.gif
app/assets/images/alerts/title.gif
app/assets/images/bitbucket_create.png
app/assets/images/bitbucket_goto.png
app/assets/images/bitbucket_inactive.png
app/assets/images/campfire_create.png
app/assets/images/campfire_goto.png
app/assets/images/campfire_inactive.png
app/assets/images/fogbugz_create.png
app/assets/images/fogbugz_goto.png
app/assets/images/fogbugz_inactive.png
app/assets/images/github_create.png
app/assets/images/github_goto.png
app/assets/images/github_inactive.png
app/assets/images/gitlab_create.png
@@ -4,7 +4,6 @@ gem &#39;rails&#39;, &#39;3.2.8&#39;
 gem 'mongoid', '~> 2.4.10'
 gem 'mongoid_rails_migrations'
 gem 'devise', '~> 1.5.3'
-gem 'nokogiri'
 gem 'haml'
 gem 'htmlentities', "~> 4.3.0"
 gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
@@ -37,6 +36,8 @@ gem &#39;pivotal-tracker&#39;
 gem 'ruby-fogbugz', :require => 'fogbugz'
 # Github Issues
 gem 'octokit', '~> 1.0.0'
+# Gitlab
+gem 'gitlab'
 # Bitbucket Issues
 gem 'bitbucket_rest_api'
@@ -66,8 +67,6 @@ platform :ruby do
   gem 'bson_ext', '= 1.6.2'
 end
-gem 'omniauth'
-gem 'oa-core'
 gem 'ri_cal'
 gem 'yajl-ruby', :require => "yajl"
@@ -77,25 +76,22 @@ group :development, :test do
   unless ENV["CI"]
     gem 'ruby-debug', :platform => :mri_18
     gem 'debugger', :platform => :mri_19
-    gem 'pry'
     gem 'pry-rails'
   end
 #  gem 'rpm_contrib'
 #  gem 'newrelic_rpm'
   gem 'capistrano'
-  gem 'capistrano_colors'
 end
 group :test do
   gem 'capybara'
   gem 'launchy'
-  gem 'rspec', '~> 2.6'
   gem 'database_cleaner', '~> 0.6.0'
   gem 'email_spec'
   gem 'timecop'
 end
-group :heroku do
+group :heroku, :production do
   gem 'unicorn'
 end
@@ -108,6 +104,7 @@ group :assets do
   gem 'execjs'
   gem 'therubyracer', :platform => :ruby  # C Ruby (MRI) or Rubinius, but NOT Windows
   gem 'uglifier',     '>= 1.0.3'
+  gem 'underscore-rails'
 end
 gem 'turbo-sprockets-rails3'
@@ -49,13 +49,12 @@ GEM
     builder (3.0.4)
     campy (0.1.3)
       multi_json (~> 1.0)
-    capistrano (2.13.4)
+    capistrano (2.13.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    capistrano_colors (0.5.5)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -73,13 +72,13 @@ GEM
       rdoc
     daemons (1.1.8)
     database_cleaner (0.6.7)
-    debugger (1.2.0)
+    debugger (1.2.1)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
+      debugger-ruby_core_source (~> 1.1.4)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
+    debugger-ruby_core_source (1.1.4)
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
@@ -169,7 +168,6 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.5)
-    oa-core (0.3.2)
     oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)
@@ -295,13 +293,14 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turbo-sprockets-rails3 (0.1.10)
-      railties (>= 3.1.0)
+    turbo-sprockets-rails3 (0.2.12)
+      railties (>= 3.1.0, < 3.2.9)
       sprockets (>= 2.0.0)
     tzinfo (0.3.33)
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
+    underscore-rails (1.4.2.1)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack
@@ -328,7 +327,6 @@ DEPENDENCIES
   bson_ext (= 1.6.2)
   campy
   capistrano
-  capistrano_colors
   capybara
   database_cleaner (~> 0.6.0)
   debugger
@@ -348,21 +346,16 @@ DEPENDENCIES
   mongo (= 1.6.2)
   mongoid (~> 2.4.10)
   mongoid_rails_migrations
-  nokogiri
-  oa-core
   octokit (~> 1.0.0)
-  omniauth
   omniauth-github
   oruen_redmine_client
   pivotal-tracker
-  pry
   pry-rails
   rack-ssl
   rack-ssl-enforcer
   rails (= 3.2.8)
   rails_autolink (~> 1.0.9)
   ri_cal
-  rspec (~> 2.6)
   rspec-rails (~> 2.6)
   ruby-debug
   ruby-fogbugz
@@ -372,6 +365,7 @@ DEPENDENCIES
   timecop
   turbo-sprockets-rails3
   uglifier (>= 1.0.3)
+  underscore-rails
   unicorn
   useragent (~> 0.3.1)
   webmock
@@ -311,6 +311,7 @@ When upgrading Errbit, please run:
 ```bash
 git pull origin master # assuming origin is the github.com/errbit/errbit repo
+bundle install
 rake db:migrate
 ```
@@ -376,12 +377,19 @@ card_type = Defect, status = Open, priority = Essential
 * For 'Account/Repository', the account will either be a username or organization. i.e. **errbit/errbit**
 * You will also need to provide your username and password for your GitHub account.
   * (We'd really appreciate it if you wanted to help us implement OAuth instead!)
-  
+
 **Bitbucket Issues Integration**
 * For 'BITBUCKET REPO' field, the account will either be a username or organization. i.e. **errbit/errbit**
 * You will also need to provide your username and password for your Bitbucket account.
+**Gitlab Issues Integration**
+
+* Account is the host of your gitlab installation. i.e. **http://gitlab.example.com**
+* To authenticate, Errbit uses token-based authentication. Get your API Key in your user settings (or create special user for this purpose)
+* You also need to provide project name (shortname) or ID (number) for issues to be created
+* **Currently (as of 3.0), Gitlab has 2000 character limit for issue description.** It is necessary to turn it off at your instance, because Errbit issues body is much longer. Please comment validation line in issue model in models folder https://github.com/gitlabhq/gitlabhq/blob/master/app/models/issue.rb#L10
+
 What if Errbit has an error?
@@ -436,10 +444,15 @@ Special Thanks
 --------------
 * [Michael Parenteau](http://michaelparenteau.com) - For rocking the Errbit design and providing a great user experience.
-* [Nick Recobra aka oruen](https://github.com/oruen) - Nick is Errbit's first core contributor. He's been working hard at making Errbit more awesome.
+* [Nick Recobra (@oruen)](https://github.com/oruen) - Nick is Errbit's first core contributor. He's been working hard at making Errbit more awesome.
+* [Nathan Broadbent (@ndbroadbent)](https://github.com/ndbroadbent) - Maintaining Errbit and contributing many features
+* [Vasiliy Ermolovich (@nashby)](https://github.com/nashby) - Contributing and helping to resolve issues and pull requests
+* [Marcin Ciunelis (@martinciu)](https://github.com/martinciu) - Helping to improve Errbit's architecture
 * [Relevance](http://thinkrelevance.com) - For giving me Open-source Fridays to work on Errbit and all my awesome co-workers for giving feedback and inspiration.
 * [Thoughtbot](http://thoughtbot.com) - For being great open-source advocates and setting the bar with [Airbrake](http://airbrakeapp.com).
+See the [contributors graph](https://github.com/errbit/errbit/graphs/contributors) for further details.
+
 Contributing
 ------------
 //= require jquery
-//= require underscore-1.1.6
+//= require underscore
 //= require rails
 //= require form
 //= require jquery.pjax
@@ -1,26 +0,0 @@
-// Underscore.js 1.1.6
-// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){var p=this,C=p._,m={},i=Array.prototype,n=Object.prototype,f=i.slice,D=i.unshift,E=n.toString,l=n.hasOwnProperty,s=i.forEach,t=i.map,u=i.reduce,v=i.reduceRight,w=i.filter,x=i.every,y=i.some,o=i.indexOf,z=i.lastIndexOf;n=Array.isArray;var F=Object.keys,q=Function.prototype.bind,b=function(a){return new j(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):p._=b;b.VERSION="1.1.6";var h=b.each=b.forEach=function(a,c,d){if(a!=null)if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e=
-0,k=a.length;e<k;e++){if(c.call(d,a[e],e,a)===m)break}else for(e in a)if(l.call(a,e)&&c.call(d,a[e],e,a)===m)break};b.map=function(a,c,b){var e=[];if(a==null)return e;if(t&&a.map===t)return a.map(c,b);h(a,function(a,g,G){e[e.length]=c.call(b,a,g,G)});return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var k=d!==void 0;a==null&&(a=[]);if(u&&a.reduce===u)return e&&(c=b.bind(c,e)),k?a.reduce(c,d):a.reduce(c);h(a,function(a,b,f){!k&&b===0?(d=a,k=!0):d=c.call(e,d,a,b,f)});if(!k)throw new TypeError("Reduce of empty array with no initial value");
-return d};b.reduceRight=b.foldr=function(a,c,d,e){a==null&&(a=[]);if(v&&a.reduceRight===v)return e&&(c=b.bind(c,e)),d!==void 0?a.reduceRight(c,d):a.reduceRight(c);a=(b.isArray(a)?a.slice():b.toArray(a)).reverse();return b.reduce(a,c,d,e)};b.find=b.detect=function(a,c,b){var e;A(a,function(a,g,f){if(c.call(b,a,g,f))return e=a,!0});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(w&&a.filter===w)return a.filter(c,b);h(a,function(a,g,f){c.call(b,a,g,f)&&(e[e.length]=a)});return e};
-b.reject=function(a,c,b){var e=[];if(a==null)return e;h(a,function(a,g,f){c.call(b,a,g,f)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=!0;if(a==null)return e;if(x&&a.every===x)return a.every(c,b);h(a,function(a,g,f){if(!(e=e&&c.call(b,a,g,f)))return m});return e};var A=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=!1;if(a==null)return e;if(y&&a.some===y)return a.some(c,d);h(a,function(a,b,f){if(e=c.call(d,a,b,f))return m});return e};b.include=b.contains=function(a,c){var b=
-!1;if(a==null)return b;if(o&&a.indexOf===o)return a.indexOf(c)!=-1;A(a,function(a){if(b=a===c)return!0});return b};b.invoke=function(a,c){var d=f.call(arguments,2);return b.map(a,function(a){return(c.call?c||a:a[c]).apply(a,d)})};b.pluck=function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,
-c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b<e.computed&&(e={value:a,computed:b})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,f){return{value:a,criteria:c.call(d,a,b,f)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=
-function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return f.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?f.call(a,0,b):a[0]};b.rest=b.tail=function(a,b,d){return f.call(a,b==null||d?1:b)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a){return b.reduce(a,function(a,d){if(b.isArray(d))return a.concat(b.flatten(d));
-a[a.length]=d;return a},[])};b.without=function(a){var c=f.call(arguments,1);return b.filter(a,function(a){return!b.include(c,a)})};b.uniq=b.unique=function(a,c){return b.reduce(a,function(a,e,f){if(0==f||(c===!0?b.last(a)!=e:!b.include(a,e)))a[a.length]=e;return a},[])};b.intersect=function(a){var c=f.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),
-e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(o&&a.indexOf===o)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(z&&a.lastIndexOf===z)return a.lastIndexOf(b);for(var d=a.length;d--;)if(a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a||0,a=0);d=arguments[2]||1;for(var e=Math.max(Math.ceil((b-a)/
-d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};b.bind=function(a,b){if(a.bind===q&&q)return q.apply(a,f.call(arguments,1));var d=f.call(arguments,2);return function(){return a.apply(b,d.concat(f.call(arguments)))}};b.bindAll=function(a){var c=f.call(arguments,1);c.length==0&&(c=b.functions(a));h(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var b=c.apply(this,arguments);return l.call(d,b)?d[b]:d[b]=a.apply(this,arguments)}};b.delay=
-function(a,b){var d=f.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(f.call(arguments,1)))};var B=function(a,b,d){var e;return function(){var f=this,g=arguments,h=function(){e=null;a.apply(f,g)};d&&clearTimeout(e);if(d||!e)e=setTimeout(h,b)}};b.throttle=function(a,b){return B(a,b,!1)};b.debounce=function(a,b){return B(a,b,!0)};b.once=function(a){var b=!1,d;return function(){if(b)return d;b=!0;return d=a.apply(this,arguments)}};
-b.wrap=function(a,b){return function(){var d=[a].concat(f.call(arguments));return b.apply(this,d)}};b.compose=function(){var a=f.call(arguments);return function(){for(var b=f.call(arguments),d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,
-b.identity)};b.functions=b.methods=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=
-typeof c)return!1;if(a==c)return!0;if(!a&&c||a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&&a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;
-for(var f in a)if(!(f in c)||!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=n||function(a){return E.call(a)==="[object Array]"};b.isArguments=function(a){return!(!a||!l.call(a,"callee"))};b.isFunction=function(a){return!(!a||!a.constructor||!a.call||!a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};
-b.isNumber=function(a){return!!(a===0||a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0||a===!1};b.isDate=function(a){return!(!a||!a.getTimezoneOffset||!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a||!a.test||!a.exec||!(a.ignoreCase||a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=
-0;e<a;e++)b.call(d,e)};b.mixin=function(a){h(b.functions(a),function(c){H(c,b[c]=a[c])})};var I=0;b.uniqueId=function(a){var b=I++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g};b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate,function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate||
-null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d};var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b,a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort",
-"splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped,arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})();
 \ No newline at end of file
@@ -586,8 +586,8 @@ div.issue_tracker.nested label.r_on, div.issue_tracker.nested label.r_on:hover, 
 table.apps tbody tr:hover td ,table.errs tbody tr:hover td { background-color: #F2F2F2;}
 table.apps td.name, table.errs td.message { width: 100%; }
-table.apps td { padding: 16px 25px; }
-table.apps th { padding: 10px 25px; }
+table.apps td { padding: 16px 20px; }
+table.apps th { padding: 10px 20px; }
 table.apps td.issue_tracker, table.apps td.count, table.apps td.deploy {
   text-align: center;
@@ -894,6 +894,11 @@ table.errs tr td.message .inline_comment em.commenter {
   color: #777;
 }
+textarea#comment_body {
+  width: 420px;
+  height: 80px;
+}
+
 .current.asc:after { content: ' ↑'; }
 .current.desc:after { content: ' ↓'; }
@@ -3,16 +3,16 @@
 <% trackers.each do |tracker| %>
 div.issue_tracker.nested label.<%= tracker %> {
-  background: url(/assets/<%= tracker %>_inactive.png) no-repeat;
+  background: url(<%= tracker %>_inactive.png) no-repeat;
 }
 div.issue_tracker.nested label.r_on.<%= tracker %> {
-  background: url(/assets/<%= tracker %>_create.png) no-repeat;
+  background: url(<%= tracker %>_create.png) no-repeat;
 }
 #action-bar a.<%= tracker %>_create {
-   background: transparent url(/assets/<%= tracker %>_create.png) 6px 5px no-repeat;
+   background: transparent url(<%= tracker %>_create.png) 6px 5px no-repeat;
 }
 #action-bar a.<%= tracker %>_goto {
-  background: transparent url(/assets/<%= tracker %>_goto.png) 6px 5px no-repeat;
+  background: transparent url(<%= tracker %>_goto.png) 6px 5px no-repeat;
 }
 <% end %>
@@ -17,7 +17,7 @@
 	text-align: center;
 	line-height: 1.75em;
 	color: #666;
-	background: #CCC url(/images/alerts/title.gif) top repeat-x;
+	background: #CCC url(alerts/title.gif) top repeat-x;
 	border: solid 1px #FFF;
 	border-bottom: solid 1px #999;
 	cursor: default;
@@ -26,21 +26,21 @@
 }
 #popup_content {
-	background: 16px 16px no-repeat url(/images/alerts/info.gif);
+	background: 16px 16px no-repeat url(alerts/info.gif);
 	padding: 1em 1.75em;
 	margin: 0em;
 }
 #popup_content.alert {
-	background-image: url(/images/alerts/info.gif);
+	background-image: url(alerts/info.gif);
 }
 #popup_content.confirm {
-	background-image: url(/images/alerts/important.gif);
+	background-image: url(alerts/important.gif);
 }
 #popup_content.prompt {
-	background-image: url(/images/alerts/help.gif);
+	background-image: url(alerts/help.gif);
 }
 #popup_message {
@@ -3,16 +3,16 @@
 <% notification_services.each do |notification_service| %>
 div.notification_service.nested label.<%= notification_service %> {
-  background: url(/assets/<%= notification_service %>_inactive.png) no-repeat;
+  background: url(<%= notification_service %>_inactive.png) no-repeat;
 }
 div.notification_service.nested label.r_on.<%= notification_service %> {
-  background: url(/assets/<%= notification_service %>_create.png) no-repeat;
+  background: url(<%= notification_service %>_create.png) no-repeat;
 }
 #action-bar a.<%= notification_service %>_create {
-  background: transparent url(/assets/<%= notification_service %>_create.png) 6px 5px no-repeat;
+  background: transparent url(<%= notification_service %>_create.png) 6px 5px no-repeat;
 }
 #action-bar a.<%= notification_service %>_goto {
-  background: transparent url(/assets/<%= notification_service %>_goto.png) 6px 5px no-repeat;
+  background: transparent url(<%= notification_service %>_goto.png) 6px 5px no-repeat;
 }
 <% end %>
@@ -52,23 +52,7 @@ class AppsController &lt; InheritedResources::Base
   protected
     def collection
-      @unresolved_counts, @problem_counts = {}, {}
-      @apps ||= begin
-        apps = end_of_association_chain.all
-
-        # Cache counts for unresolved errs and problems
-        apps.each do |app|
-          @unresolved_counts[app.id] ||= app.problems.unresolved.count
-          @problem_counts[app.id]    ||= app.problems.count
-        end
-
-        # Sort apps by number of unresolved errs, then problem counts.
-        apps.sort do |a,b|
-          (@unresolved_counts[b.id] <=> @unresolved_counts[a.id]).nonzero? ||
-          (@problem_counts[b.id] <=> @problem_counts[a.id]).nonzero? ||
-          a.name <=> b.name
-        end
-      end
+      @apps ||= end_of_association_chain.all.sort
     end
     def initialize_subclassed_issue_tracker
@@ -80,7 +64,7 @@ class AppsController &lt; InheritedResources::Base
       end
     end
-  def initialize_subclassed_notification_service
+    def initialize_subclassed_notification_service
       # set the app's notification service
       if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]
         if NotificationService.subclasses.map(&:name).concat(["NotificationService"]).include?(notification_type)
 class ProblemsController < ApplicationController
-  include ActionView::Helpers::TextHelper
-
   before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
   before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
   before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
@@ -37,36 +35,10 @@ class ProblemsController &lt; ApplicationController
   end
   def create_issue
-    # Create an issue on GitHub using user's github token
-    if params[:tracker] == 'user_github'
-      if !@app.github_repo?
-        flash[:error] = "This app doesn't have a GitHub repo set up."
-      elsif !current_user.github_account?
-        flash[:error] = "You haven't linked your Github account."
-      else
-        @tracker = GithubIssuesTracker.new(
-          :app         => @app,
-          :username    => current_user.github_login,
-          :oauth_token => current_user.github_oauth_token
-        )
-      end
-
-    # Or, create an issue using the App's issue tracker
-    elsif @app.issue_tracker_configured?
-      @tracker = @app.issue_tracker
+    issue_creation = IssueCreation.new(@problem, current_user, params[:tracker])
-    # Otherwise, display error about missing tracker configuration.
-    else
-      flash[:error] = "This app has no issue tracker setup."
-    end
-
-    if flash[:error].blank? && @tracker
-      begin
-        @tracker.create_issue @problem, current_user
-      rescue Exception => ex
-        Rails.logger.error "Error during issue creation: " << ex.message
-        flash[:error] = "There was an error during issue creation: #{ex.message}"
-      end
+    unless issue_creation.execute
+      flash[:error] = issue_creation.errors[:base].first
     end
     redirect_to app_problem_path(@app, @problem)
@@ -87,13 +59,13 @@ class ProblemsController &lt; ApplicationController
   def resolve_several
     @selected_problems.each(&:resolve!)
-    flash[:success] = "Great news everyone! #{pluralize(@selected_problems.count, 'err has', 'errs have')} been resolved."
+    flash[:success] = "Great news everyone! #{I18n.t(:n_errs_have, :count => @selected_problems.count)} been resolved."
     redirect_to :back
   end
   def unresolve_several
     @selected_problems.each(&:unresolve!)
-    flash[:success] = "#{pluralize(@selected_problems.count, 'err has', 'errs have')} been unresolved."
+    flash[:success] = "#{I18n.t(:n_errs_have, :count => @selected_problems.count)} been unresolved."
     redirect_to :back
   end
@@ -109,13 +81,13 @@ class ProblemsController &lt; ApplicationController
   def unmerge_several
     all = @selected_problems.map(&:unmerge!).flatten
-    flash[:success] = "#{pluralize(all.length, 'err has', 'errs have')} been unmerged."
+    flash[:success] = "#{I18n.t(:n_errs_have, :count => all.length)} been unmerged."
     redirect_to :back
   end
   def destroy_several
     nb_problem_destroy = ProblemDestroy.execute(@selected_problems)
-    flash[:notice] = "#{pluralize(nb_problem_destroy, 'err has', 'errs have')} been deleted."
+    flash[:notice] = "#{I18n.t(:n_errs_have, :count => nb_problem_destroy)} been deleted."
     redirect_to :back
   end
@@ -19,13 +19,13 @@ module BacktraceLineHelper
   def link_to_github(line, text = nil)
     return unless line.app.github_repo?
-    href = "%s#L%s" % [line.app.github_url_to_file(line.file), line.number]
+    href = "%s#L%s" % [line.app.github_url_to_file(line.decorated_path + line.file_name), line.number]
     link_to(text || line.file_name, href, :target => '_blank')
   end
   def link_to_bitbucket(line, text = nil)
     return unless line.app.bitbucket_repo?
-    href = "%s#cl-%s" % [line.app.bitbucket_url_to_file(line.file), line.number]
+    href = "%s#cl-%s" % [line.app.bitbucket_url_to_file(line.decorated_path + line.file_name), line.number]
     link_to(text || line.file_name, href, :target => '_blank')
   end
 # encoding: utf-8
 module NoticesHelper
   def notice_atom_summary(notice)
-    render "notices/atom_entry.html.haml", :notice => notice
+    render "notices/atom_entry", :notice => notice
   end
 end
-
@@ -0,0 +1,55 @@
+class IssueCreation
+  include ActiveModel::Validations
+
+  attr_reader :problem, :user, :tracker_name
+
+  delegate :app, :to => :problem
+
+  def initialize(problem, user, tracker_name)
+    @problem = problem
+    @user    = user
+    @tracker_name = tracker_name
+  end
+
+  def tracker
+    return @tracker if @tracker
+
+    # Create an issue on GitHub using user's github token
+    if tracker_name == 'user_github'
+      if !app.github_repo?
+        errors.add :base, "This app doesn't have a GitHub repo set up."
+      elsif !user.github_account?
+        errors.add :base, "You haven't linked your Github account."
+      else
+        @tracker = GithubIssuesTracker.new(
+          :app         => app,
+          :username    => user.github_login,
+          :oauth_token => user.github_oauth_token
+        )
+      end
+
+    # Or, create an issue using the App's issue tracker
+    elsif app.issue_tracker_configured?
+      @tracker = app.issue_tracker
+
+    # Otherwise, display error about missing tracker configuration.
+    else
+      errors.add :base, "This app has no issue tracker setup."
+    end
+
+    @tracker
+  end
+
+  def execute
+    if tracker
+      begin
+        tracker.create_issue problem, user
+      rescue => ex
+        Rails.logger.error "Error during issue creation: " << ex.message
+        errors.add :base, "There was an error during issue creation: #{ex.message}"
+      end
+    end
+
+    errors.empty?
+  end
+end
 class App
   include Mongoid::Document
   include Mongoid::Timestamps
+  include Comparable
   field :name, :type => String
   field :api_key
@@ -98,12 +99,16 @@ class App
   # Legacy apps don't have notify_on_errs and notify_on_deploys params
   def notify_on_errs
-    !(self[:notify_on_errs] == false)
+    !(super == false)
   end
   alias :notify_on_errs? :notify_on_errs
+  def notifiable?
+    notify_on_errs? && notification_recipients.any?
+  end
+
   def notify_on_deploys
-    !(self[:notify_on_deploys] == false)
+    !(super == false)
   end
   alias :notify_on_deploys? :notify_on_deploys
@@ -137,11 +142,11 @@ class App
   def issue_tracker_configured?
-    !!(issue_tracker && issue_tracker.class < IssueTracker && issue_tracker.project_id.present?)
+    !!(issue_tracker.class < IssueTracker && issue_tracker.configured?)
   end
   def notification_service_configured?
-    !!(notification_service && notification_service.class < NotificationService && notification_service.api_token.present?)
+    !!(notification_service.class < NotificationService && notification_service.configured?)
   end
@@ -169,6 +174,25 @@ class App
     end
   end
+  def unresolved_count
+    @unresolved_count ||= problems.unresolved.count
+  end
+
+  def problem_count
+    @problem_count ||= problems.count
+  end
+
+  # Compare by number of unresolved errs, then problem counts.
+  def <=>(other)
+    (other.unresolved_count <=> unresolved_count).nonzero? ||
+    (other.problem_count <=> problem_count).nonzero? ||
+    name <=> other.name
+  end
+
+  def email_at_notices
+    Errbit::Config.per_app_email_at_notices ? super : Errbit::Config.email_at_notices
+  end
+
   protected
     def store_cached_attributes_on_problems
@@ -35,5 +35,9 @@ class IssueTracker
   Label = ''
   def self.label; self::Label; end
   def label; self.class.label; end
+
+  def configured?
+    project_id.present?
+  end
 end
@@ -35,7 +35,7 @@ if defined? Octokit
       end
       begin
-        issue = client.create_issue(project_id, issue_title(problem), body_template.result(binding).unpack('C*').pack('U*'), options = {})
+        issue = client.create_issue(project_id, issue_title(problem), body_template.result(binding).unpack('C*').pack('U*'))
         problem.update_attributes(
           :issue_link => issue.html_url,
           :issue_type => Label
@@ -54,4 +54,4 @@ if defined? Octokit
       "https://github.com/#{project_id}/issues"
     end
   end
-end
 \ No newline at end of file
+end
@@ -0,0 +1,43 @@
+if defined? Gitlab
+  class IssueTrackers::GitlabTracker < IssueTracker
+    Label = "gitlab"
+    Fields = [
+      [:account, {
+        :label       => "Gitlab URL",
+        :placeholder => "e.g. https://example.net"
+      }],
+      [:api_token, {
+        :placeholder => "API Token for your account"
+      }],
+      [:project_id, {
+        :label       => "Ticket Project Short Name / ID",
+        :placeholder => "Gitlab Project where issues will be created"
+      }]
+    ]
+
+    def check_params
+      if Fields.detect {|f| self[f[0]].blank?}
+        errors.add :base, 'You must specify your Gitlab URL, API token and Project ID'
+      end
+    end
+
+    def create_issue(problem, reported_by = nil)
+      Gitlab.configure do |config|
+        config.endpoint = "#{account}/api/v2"
+        config.private_token = api_token
+        config.user_agent = 'Errbit User Agent'
+      end
+      title = issue_title problem
+      description = body_template.result(binding)
+      Gitlab.create_issue(project_id, title, { :description => description, :labels => "errbit" } )
+    end
+
+    def body_template
+      @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/gitlab_body.txt.erb").gsub(/^\s*/, ''))
+    end
+    
+    def url
+      "#{account}/#{project_id}/issues"
+    end
+  end
+end
@@ -3,19 +3,22 @@ if defined? Lighthouse
     Label = "lighthouseapp"
     Fields = [
       [:account, {
-        :placeholder => "abc from http://abc.lighthouseapp.com"
+        :label       => "Subdomain",
+        :placeholder => "subdomain from http://{{subdomain}}.lighthouseapp.com"
       }],
       [:api_token, {
-        :placeholder => "API Token for your account"
+        :label       => "API Token",
+        :placeholder => "123456789abcdef123456789abcdef"
       }],
       [:project_id, {
-        :placeholder => "Lighthouse project"
+        :label       => "Project ID",
+        :placeholder => "123456"
       }]
     ]
     def check_params
       if Fields.detect {|f| self[f[0]].blank? }
-        errors.add :base, 'You must specify your Lighthouseapp account, API token and Project ID'
+        errors.add :base, 'You must specify your Lighthouseapp Subdomain, API token and Project ID'
       end
     end
@@ -4,7 +4,7 @@ if defined? RedmineClient
     Fields = [
       [:account, {
         :label       => "Redmine URL",
-        :placeholder => "e.g. http://www.redmine.org/"
+        :placeholder => "http://www.redmine.org/"
       }],
       [:api_token, {
         :placeholder => "API Token for your account"
@@ -13,7 +13,7 @@ class Notice
   field :current_user, :type => Hash
   field :error_class
   delegate :lines, :to => :backtrace, :prefix => true
-  delegate :app, :to => :err
+  delegate :app, :problem, :to => :err
   belongs_to :err
   belongs_to :backtrace, :index => true
@@ -36,8 +36,6 @@ class Notice
   scope :reverse_ordered, order_by(:created_at.desc)
   scope :for_errs, lambda {|errs| where(:err_id.in => errs.all.map(&:id))}
-  delegate :app, :problem, :to => :err
-
   def user_agent
     agent_string = env_vars['HTTP_USER_AGENT']
     agent_string.blank? ? nil : UserAgent.parse(agent_string)
@@ -66,7 +64,7 @@ class Notice
   end
   def request
-    read_attribute(:request) || {}
+    super || {}
   end
   def url
@@ -96,6 +94,18 @@ class Notice
     backtrace_lines.in_app
   end
+  def similar_count
+    problem.notices_count
+  end
+
+  def notifiable?
+    app.email_at_notices.include?(similar_count)
+  end
+
+  def should_notify?
+    app.notifiable? && notifiable?
+  end
+
   protected
   def increase_counter_cache
@@ -7,16 +7,7 @@ class NoticeObserver &lt; Mongoid::Observer
       notice.app.notification_service.create_notification(notice.problem)
     end
-    if notice.app.notification_recipients.any?
-      Mailer.err_notification(notice).deliver
-    end
+    Mailer.err_notification(notice).deliver if notice.should_notify?
   end
-  private
-
-  def should_notify? notice
-    app = notice.app
-    app.notify_on_errs? and (app.notification_recipients.any? or !app.notification_service.nil?) and
-      (app.email_at_notices or Errbit::Config.email_at_notices).include?(notice.problem.notices_count)
-  end
 end
@@ -30,4 +30,8 @@ class NotificationService
   Label = ''
   def self.label; self::Label; end
   def label; self.class.label; end
+
+  def configured?
+    api_token.present?
+  end
 end
@@ -2,16 +2,18 @@ if defined? Campy
   class NotificationServices::CampfireService < NotificationService
     Label = "campfire"
     Fields = [
-        [:subdomain, {
-            :placeholder => "Campfire Subdomain"
-        }],
-        [:api_token, {
-            :placeholder => "API Token"
-        }],
-        [:room_id, {
-            :placeholder => "Room ID",
-            :label       => "Room ID"
-        }],
+      [:subdomain, {
+        :label       => "Subdomain",
+        :placeholder => "subdomain from http://{{subdomain}}.campfirenow.com"
+      }],
+      [:api_token, {
+        :label       => "API Token",
+        :placeholder => "123456789abcdef123456789abcdef"
+      }],
+      [:room_id, {
+        :label       => "Room ID",
+        :placeholder => "123456"
+      }]
     ]
     def check_params
@@ -21,7 +23,7 @@ if defined? Campy
     end
     def url
-      "http://campfirenow.com/"
+      "http://#{subdomain}.campfirenow.com/"
     end
     def create_notification(problem)
@@ -31,4 +33,4 @@ if defined? Campy
       campy.speak "[errbit] #{problem.app.name} #{notification_description problem} - http://#{Errbit::Config.host}/apps/#{problem.app.id.to_s}/problems/#{problem.id.to_s}"
     end
   end
 -end
+end
 \ No newline at end of file
@@ -6,8 +6,8 @@ if defined? HipChat
         :placeholder => "API Token"
       }],
       [:room_id, {
-        :placeholder => "Room ID",
-        :label       => "Room ID"
+        :placeholder => "Room name",
+        :label       => "Room name"
       }],
     ]
@@ -17,6 +17,10 @@ if defined? HipChat
       end
     end
+    def url
+      "https://www.hipchat.com/sign_in"
+    end
+
     def create_notification(problem)
       url = app_problem_url problem.app, problem
       message = <<-MSG.strip_heredoc
@@ -28,4 +32,4 @@ if defined? HipChat
       client[room_id].send('Errbit', message, :color => 'red')
     end
   end
-end
 \ No newline at end of file
+end
@@ -21,6 +21,10 @@ class NotificationServices::HoiioService &lt; NotificationService
     end
   end
+  def url
+    "https://secure.hoiio.com/user/"
+  end
+
   def notification_description(problem)
     "[#{ problem.environment }]#{problem.message.to_s.truncate(50)}"
   end
@@ -17,6 +17,10 @@ class NotificationServices::PushoverService &lt; NotificationService
     end
   end
+  def url
+    "https://pushover.net/login"
+  end
+
   def create_notification(problem)
     # build the hoi client
     notification = Rushover::Client.new(subdomain)
@@ -57,6 +57,10 @@ class Problem
     Notice.for_errs(errs).ordered
   end
+  def comments_allowed?
+    Errbit::Config.allow_comments_with_issue_tracker || !app.issue_tracker_configured?
+  end
+
   def resolve!
     self.update_attributes!(:resolved => true, :resolved_at => Time.now)
   end
	@@ -49,13 +49,12 @@ GEM		@@ -49,13 +49,12 @@ GEM
49	builder (3.0.4)	49	builder (3.0.4)
50	campy (0.1.3)	50	campy (0.1.3)
51	multi_json (~> 1.0)	51	multi_json (~> 1.0)
52	- capistrano (2.13.4)	52	+ capistrano (2.13.5)
53	highline	53	highline
54	net-scp (>= 1.0.0)	54	net-scp (>= 1.0.0)
55	net-sftp (>= 2.0.0)	55	net-sftp (>= 2.0.0)
56	net-ssh (>= 2.0.14)	56	net-ssh (>= 2.0.14)
57	net-ssh-gateway (>= 1.1.0)	57	net-ssh-gateway (>= 1.1.0)
58	- capistrano_colors (0.5.5)
59	capybara (1.1.2)	58	capybara (1.1.2)
60	mime-types (>= 1.16)	59	mime-types (>= 1.16)
61	nokogiri (>= 1.3.3)	60	nokogiri (>= 1.3.3)
	@@ -73,13 +72,13 @@ GEM		@@ -73,13 +72,13 @@ GEM
73	rdoc	72	rdoc
74	daemons (1.1.8)	73	daemons (1.1.8)
75	database_cleaner (0.6.7)	74	database_cleaner (0.6.7)
76	- debugger (1.2.0)	75	+ debugger (1.2.1)
77	columnize (>= 0.3.1)	76	columnize (>= 0.3.1)
78	debugger-linecache (~> 1.1.1)	77	debugger-linecache (~> 1.1.1)
79	- debugger-ruby_core_source (~> 1.1.3)	78	+ debugger-ruby_core_source (~> 1.1.4)
80	debugger-linecache (1.1.2)	79	debugger-linecache (1.1.2)
81	debugger-ruby_core_source (>= 1.1.1)	80	debugger-ruby_core_source (>= 1.1.1)
82	- debugger-ruby_core_source (1.1.3)	81	+ debugger-ruby_core_source (1.1.4)
83	devise (1.5.3)	82	devise (1.5.3)
84	bcrypt-ruby (~> 3.0)	83	bcrypt-ruby (~> 3.0)
85	orm_adapter (~> 0.0.3)	84	orm_adapter (~> 0.0.3)
	@@ -169,7 +168,6 @@ GEM		@@ -169,7 +168,6 @@ GEM
169	net-ssh-gateway (1.1.0)	168	net-ssh-gateway (1.1.0)
170	net-ssh (>= 1.99.1)	169	net-ssh (>= 1.99.1)
171	nokogiri (1.5.5)	170	nokogiri (1.5.5)
172	- oa-core (0.3.2)
173	oauth2 (0.8.0)	171	oauth2 (0.8.0)
174	faraday (~> 0.8)	172	faraday (~> 0.8)
175	httpauth (~> 0.1)	173	httpauth (~> 0.1)
	@@ -295,13 +293,14 @@ GEM		@@ -295,13 +293,14 @@ GEM
295	treetop (1.4.10)	293	treetop (1.4.10)
296	polyglot	294	polyglot
297	polyglot (>= 0.3.1)	295	polyglot (>= 0.3.1)
298	- turbo-sprockets-rails3 (0.1.10)
299	- railties (>= 3.1.0)	296	+ turbo-sprockets-rails3 (0.2.12)
		297	+ railties (>= 3.1.0, < 3.2.9)
300	sprockets (>= 2.0.0)	298	sprockets (>= 2.0.0)
301	tzinfo (0.3.33)	299	tzinfo (0.3.33)
302	uglifier (1.2.7)	300	uglifier (1.2.7)
303	execjs (>= 0.3.0)	301	execjs (>= 0.3.0)
304	multi_json (~> 1.3)	302	multi_json (~> 1.3)
		303	+ underscore-rails (1.4.2.1)
305	unicorn (4.3.1)	304	unicorn (4.3.1)
306	kgio (~> 2.6)	305	kgio (~> 2.6)
307	rack	306	rack
	@@ -328,7 +327,6 @@ DEPENDENCIES		@@ -328,7 +327,6 @@ DEPENDENCIES
328	bson_ext (= 1.6.2)	327	bson_ext (= 1.6.2)
329	campy	328	campy
330	capistrano	329	capistrano
331	- capistrano_colors
332	capybara	330	capybara
333	database_cleaner (~> 0.6.0)	331	database_cleaner (~> 0.6.0)
334	debugger	332	debugger
	@@ -348,21 +346,16 @@ DEPENDENCIES		@@ -348,21 +346,16 @@ DEPENDENCIES
348	mongo (= 1.6.2)	346	mongo (= 1.6.2)
349	mongoid (~> 2.4.10)	347	mongoid (~> 2.4.10)
350	mongoid_rails_migrations	348	mongoid_rails_migrations
351	- nokogiri
352	- oa-core
353	octokit (~> 1.0.0)	349	octokit (~> 1.0.0)
354	- omniauth
355	omniauth-github	350	omniauth-github
356	oruen_redmine_client	351	oruen_redmine_client
357	pivotal-tracker	352	pivotal-tracker
358	- pry
359	pry-rails	353	pry-rails
360	rack-ssl	354	rack-ssl
361	rack-ssl-enforcer	355	rack-ssl-enforcer
362	rails (= 3.2.8)	356	rails (= 3.2.8)
363	rails_autolink (~> 1.0.9)	357	rails_autolink (~> 1.0.9)
364	ri_cal	358	ri_cal
365	- rspec (~> 2.6)
366	rspec-rails (~> 2.6)	359	rspec-rails (~> 2.6)
367	ruby-debug	360	ruby-debug
368	ruby-fogbugz	361	ruby-fogbugz
	@@ -372,6 +365,7 @@ DEPENDENCIES		@@ -372,6 +365,7 @@ DEPENDENCIES
372	timecop	365	timecop
373	turbo-sprockets-rails3	366	turbo-sprockets-rails3
374	uglifier (>= 1.0.3)	367	uglifier (>= 1.0.3)
		368	+ underscore-rails
375	unicorn	369	unicorn
376	useragent (~> 0.3.1)	370	useragent (~> 0.3.1)
377	webmock	371	webmock
1	//= require jquery	1	//= require jquery
2	-//= require underscore-1.1.6	2	+//= require underscore
3	//= require rails	3	//= require rails
4	//= require form	4	//= require form
5	//= require jquery.pjax	5	//= require jquery.pjax
	@@ -1,26 +0,0 @@		@@ -1,26 +0,0 @@
1	-// Underscore.js 1.1.6
2	-// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
3	-// Underscore is freely distributable under the MIT license.
4	-// Portions of Underscore are inspired or borrowed from Prototype,
5	-// Oliver Steele's Functional, and John Resig's Micro-Templating.
6	-// For all details and documentation:
7	-// http://documentcloud.github.com/underscore
8	-(function(){var p=this,C=p._,m={},i=Array.prototype,n=Object.prototype,f=i.slice,D=i.unshift,E=n.toString,l=n.hasOwnProperty,s=i.forEach,t=i.map,u=i.reduce,v=i.reduceRight,w=i.filter,x=i.every,y=i.some,o=i.indexOf,z=i.lastIndexOf;n=Array.isArray;var F=Object.keys,q=Function.prototype.bind,b=function(a){return new j(a)};typeof module!=="undefined"&&module.exports?(module.exports=b,b._=b):p._=b;b.VERSION="1.1.6";var h=b.each=b.forEach=function(a,c,d){if(a!=null)if(s&&a.forEach===s)a.forEach(c,d);else if(b.isNumber(a.length))for(var e=
9	-0,k=a.length;e<k;e++){if(c.call(d,a[e],e,a)===m)break}else for(e in a)if(l.call(a,e)&&c.call(d,a[e],e,a)===m)break};b.map=function(a,c,b){var e=[];if(a==null)return e;if(t&&a.map===t)return a.map(c,b);h(a,function(a,g,G){e[e.length]=c.call(b,a,g,G)});return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var k=d!==void 0;a==null&&(a=[]);if(u&&a.reduce===u)return e&&(c=b.bind(c,e)),k?a.reduce(c,d):a.reduce(c);h(a,function(a,b,f){!k&&b===0?(d=a,k=!0):d=c.call(e,d,a,b,f)});if(!k)throw new TypeError("Reduce of empty array with no initial value");
10	-return d};b.reduceRight=b.foldr=function(a,c,d,e){a==null&&(a=[]);if(v&&a.reduceRight===v)return e&&(c=b.bind(c,e)),d!==void 0?a.reduceRight(c,d):a.reduceRight(c);a=(b.isArray(a)?a.slice():b.toArray(a)).reverse();return b.reduce(a,c,d,e)};b.find=b.detect=function(a,c,b){var e;A(a,function(a,g,f){if(c.call(b,a,g,f))return e=a,!0});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(w&&a.filter===w)return a.filter(c,b);h(a,function(a,g,f){c.call(b,a,g,f)&&(e[e.length]=a)});return e};
11	-b.reject=function(a,c,b){var e=[];if(a==null)return e;h(a,function(a,g,f){c.call(b,a,g,f)\|\|(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=!0;if(a==null)return e;if(x&&a.every===x)return a.every(c,b);h(a,function(a,g,f){if(!(e=e&&c.call(b,a,g,f)))return m});return e};var A=b.some=b.any=function(a,c,d){c\|\|(c=b.identity);var e=!1;if(a==null)return e;if(y&&a.some===y)return a.some(c,d);h(a,function(a,b,f){if(e=c.call(d,a,b,f))return m});return e};b.include=b.contains=function(a,c){var b=
12	-!1;if(a==null)return b;if(o&&a.indexOf===o)return a.indexOf(c)!=-1;A(a,function(a){if(b=a===c)return!0});return b};b.invoke=function(a,c){var d=f.call(arguments,2);return b.map(a,function(a){return(c.call?c\|\|a:a[c]).apply(a,d)})};b.pluck=function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a))return Math.max.apply(Math,a);var e={computed:-Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,
13	-c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};h(a,function(a,b,f){b=c?c.call(d,a,b,f):a;b<e.computed&&(e={value:a,computed:b})});return e.value};b.sortBy=function(a,c,d){return b.pluck(b.map(a,function(a,b,f){return{value:a,criteria:c.call(d,a,b,f)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c<d?-1:c>d?1:0}),"value")};b.sortedIndex=function(a,c,d){d\|\|(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=
14	-function(a){if(!a)return[];if(a.toArray)return a.toArray();if(b.isArray(a))return a;if(b.isArguments(a))return f.call(a);return b.values(a)};b.size=function(a){return b.toArray(a).length};b.first=b.head=function(a,b,d){return b!=null&&!d?f.call(a,0,b):a[0]};b.rest=b.tail=function(a,b,d){return f.call(a,b==null\|\|d?1:b)};b.last=function(a){return a[a.length-1]};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a){return b.reduce(a,function(a,d){if(b.isArray(d))return a.concat(b.flatten(d));
15	-a[a.length]=d;return a},[])};b.without=function(a){var c=f.call(arguments,1);return b.filter(a,function(a){return!b.include(c,a)})};b.uniq=b.unique=function(a,c){return b.reduce(a,function(a,e,f){if(0==f\|\|(c===!0?b.last(a)!=e:!b.include(a,e)))a[a.length]=e;return a},[])};b.intersect=function(a){var c=f.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.zip=function(){for(var a=f.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),
16	-e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d)return d=b.sortedIndex(a,c),a[d]===c?d:-1;if(o&&a.indexOf===o)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(z&&a.lastIndexOf===z)return a.lastIndexOf(b);for(var d=a.length;d--;)if(a[d]===b)return d;return-1};b.range=function(a,b,d){arguments.length<=1&&(b=a\|\|0,a=0);d=arguments[2]\|\|1;for(var e=Math.max(Math.ceil((b-a)/
17	-d),0),f=0,g=Array(e);f<e;)g[f++]=a,a+=d;return g};b.bind=function(a,b){if(a.bind===q&&q)return q.apply(a,f.call(arguments,1));var d=f.call(arguments,2);return function(){return a.apply(b,d.concat(f.call(arguments)))}};b.bindAll=function(a){var c=f.call(arguments,1);c.length==0&&(c=b.functions(a));h(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c\|\|(c=b.identity);return function(){var b=c.apply(this,arguments);return l.call(d,b)?d[b]:d[b]=a.apply(this,arguments)}};b.delay=
18	-function(a,b){var d=f.call(arguments,2);return setTimeout(function(){return a.apply(a,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(f.call(arguments,1)))};var B=function(a,b,d){var e;return function(){var f=this,g=arguments,h=function(){e=null;a.apply(f,g)};d&&clearTimeout(e);if(d\|\|!e)e=setTimeout(h,b)}};b.throttle=function(a,b){return B(a,b,!1)};b.debounce=function(a,b){return B(a,b,!0)};b.once=function(a){var b=!1,d;return function(){if(b)return d;b=!0;return d=a.apply(this,arguments)}};
19	-b.wrap=function(a,b){return function(){var d=[a].concat(f.call(arguments));return b.apply(this,d)}};b.compose=function(){var a=f.call(arguments);return function(){for(var b=f.call(arguments),d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return function(){if(--a<1)return b.apply(this,arguments)}};b.keys=F\|\|function(a){if(a!==Object(a))throw new TypeError("Invalid object");var b=[],d;for(d in a)l.call(a,d)&&(b[b.length]=d);return b};b.values=function(a){return b.map(a,
20	-b.identity)};b.functions=b.methods=function(a){return b.filter(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a){h(f.call(arguments,1),function(b){for(var d in b)b[d]!==void 0&&(a[d]=b[d])});return a};b.defaults=function(a){h(f.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,c){if(a===c)return!0;var d=typeof a;if(d!=
21	-typeof c)return!1;if(a==c)return!0;if(!a&&c\|\|a&&!c)return!1;if(a._chain)a=a._wrapped;if(c._chain)c=c._wrapped;if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return!1;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return!1;if(a.length&&a.length!==c.length)return!1;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return!1;
22	-for(var f in a)if(!(f in c)\|\|!b.isEqual(a[f],c[f]))return!1;return!0};b.isEmpty=function(a){if(b.isArray(a)\|\|b.isString(a))return a.length===0;for(var c in a)if(l.call(a,c))return!1;return!0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=n\|\|function(a){return E.call(a)==="[object Array]"};b.isArguments=function(a){return!(!a\|\|!l.call(a,"callee"))};b.isFunction=function(a){return!(!a\|\|!a.constructor\|\|!a.call\|\|!a.apply)};b.isString=function(a){return!!(a===""\|\|a&&a.charCodeAt&&a.substr)};
23	-b.isNumber=function(a){return!!(a===0\|\|a&&a.toExponential&&a.toFixed)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===!0\|\|a===!1};b.isDate=function(a){return!(!a\|\|!a.getTimezoneOffset\|\|!a.setUTCFullYear)};b.isRegExp=function(a){return!(!a\|\|!a.test\|\|!a.exec\|\|!(a.ignoreCase\|\|a.ignoreCase===!1))};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.noConflict=function(){p._=C;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=
24	-0;e<a;e++)b.call(d,e)};b.mixin=function(a){h(b.functions(a),function(c){H(c,b[c]=a[c])})};var I=0;b.uniqueId=function(a){var b=I++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g};b.template=function(a,c){var d=b.templateSettings;d="var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj\|\|{}){__p.push('"+a.replace(/\\/g,"\\\\").replace(/'/g,"\\'").replace(d.interpolate,function(a,b){return"',"+b.replace(/\\'/g,"'")+",'"}).replace(d.evaluate\|\|
25	-null,function(a,b){return"');"+b.replace(/\\'/g,"'").replace(/[\r\n\t]/g," ")+"__p.push('"}).replace(/\r/g,"\\r").replace(/\n/g,"\\n").replace(/\t/g,"\\t")+"');}return __p.join('');";d=new Function("obj",d);return c?d(c):d};var j=function(a){this._wrapped=a};b.prototype=j.prototype;var r=function(a,c){return c?b(a).chain():a},H=function(a,c){j.prototype[a]=function(){var a=f.call(arguments);D.call(a,this._wrapped);return r(c.apply(b,a),this._chain)}};b.mixin(b);h(["pop","push","reverse","shift","sort",
26	-"splice","unshift"],function(a){var b=i[a];j.prototype[a]=function(){b.apply(this._wrapped,arguments);return r(this._wrapped,this._chain)}});h(["concat","join","slice"],function(a){var b=i[a];j.prototype[a]=function(){return r(b.apply(this._wrapped,arguments),this._chain)}});j.prototype.chain=function(){this._chain=!0;return this};j.prototype.value=function(){return this._wrapped}})();
27	\ No newline at end of file	0	\ No newline at end of file
	@@ -3,16 +3,16 @@		@@ -3,16 +3,16 @@
3		3
4	<% trackers.each do \|tracker\| %>	4	<% trackers.each do \|tracker\| %>
5	div.issue_tracker.nested label.<%= tracker %> {	5	div.issue_tracker.nested label.<%= tracker %> {
6	- background: url(/assets/<%= tracker %>_inactive.png) no-repeat;	6	+ background: url(<%= tracker %>_inactive.png) no-repeat;
7	}	7	}
8	div.issue_tracker.nested label.r_on.<%= tracker %> {	8	div.issue_tracker.nested label.r_on.<%= tracker %> {
9	- background: url(/assets/<%= tracker %>_create.png) no-repeat;	9	+ background: url(<%= tracker %>_create.png) no-repeat;
10	}	10	}
11	#action-bar a.<%= tracker %>_create {	11	#action-bar a.<%= tracker %>_create {
12	- background: transparent url(/assets/<%= tracker %>_create.png) 6px 5px no-repeat;	12	+ background: transparent url(<%= tracker %>_create.png) 6px 5px no-repeat;
13	}	13	}
14	#action-bar a.<%= tracker %>_goto {	14	#action-bar a.<%= tracker %>_goto {
15	- background: transparent url(/assets/<%= tracker %>_goto.png) 6px 5px no-repeat;	15	+ background: transparent url(<%= tracker %>_goto.png) 6px 5px no-repeat;
16	}	16	}
17	<% end %>	17	<% end %>
18		18
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	text-align: center;	17	text-align: center;
18	line-height: 1.75em;	18	line-height: 1.75em;
19	color: #666;	19	color: #666;
20	- background: #CCC url(/images/alerts/title.gif) top repeat-x;	20	+ background: #CCC url(alerts/title.gif) top repeat-x;
21	border: solid 1px #FFF;	21	border: solid 1px #FFF;
22	border-bottom: solid 1px #999;	22	border-bottom: solid 1px #999;
23	cursor: default;	23	cursor: default;
	@@ -26,21 +26,21 @@		@@ -26,21 +26,21 @@
26	}	26	}
27		27
28	#popup_content {	28	#popup_content {
29	- background: 16px 16px no-repeat url(/images/alerts/info.gif);	29	+ background: 16px 16px no-repeat url(alerts/info.gif);
30	padding: 1em 1.75em;	30	padding: 1em 1.75em;
31	margin: 0em;	31	margin: 0em;
32	}	32	}
33		33
34	#popup_content.alert {	34	#popup_content.alert {
35	- background-image: url(/images/alerts/info.gif);	35	+ background-image: url(alerts/info.gif);
36	}	36	}
37		37
38	#popup_content.confirm {	38	#popup_content.confirm {
39	- background-image: url(/images/alerts/important.gif);	39	+ background-image: url(alerts/important.gif);
40	}	40	}
41		41
42	#popup_content.prompt {	42	#popup_content.prompt {
43	- background-image: url(/images/alerts/help.gif);	43	+ background-image: url(alerts/help.gif);
44	}	44	}
45		45
46	#popup_message {	46	#popup_message {
	@@ -3,16 +3,16 @@		@@ -3,16 +3,16 @@
3		3
4	<% notification_services.each do \|notification_service\| %>	4	<% notification_services.each do \|notification_service\| %>
5	div.notification_service.nested label.<%= notification_service %> {	5	div.notification_service.nested label.<%= notification_service %> {
6	- background: url(/assets/<%= notification_service %>_inactive.png) no-repeat;	6	+ background: url(<%= notification_service %>_inactive.png) no-repeat;
7	}	7	}
8	div.notification_service.nested label.r_on.<%= notification_service %> {	8	div.notification_service.nested label.r_on.<%= notification_service %> {
9	- background: url(/assets/<%= notification_service %>_create.png) no-repeat;	9	+ background: url(<%= notification_service %>_create.png) no-repeat;
10	}	10	}
11	#action-bar a.<%= notification_service %>_create {	11	#action-bar a.<%= notification_service %>_create {
12	- background: transparent url(/assets/<%= notification_service %>_create.png) 6px 5px no-repeat;	12	+ background: transparent url(<%= notification_service %>_create.png) 6px 5px no-repeat;
13	}	13	}
14	#action-bar a.<%= notification_service %>_goto {	14	#action-bar a.<%= notification_service %>_goto {
15	- background: transparent url(/assets/<%= notification_service %>_goto.png) 6px 5px no-repeat;	15	+ background: transparent url(<%= notification_service %>_goto.png) 6px 5px no-repeat;
16	}	16	}
17	<% end %>	17	<% end %>
18		18
	@@ -52,23 +52,7 @@ class AppsController < InheritedResources::Base		@@ -52,23 +52,7 @@ class AppsController < InheritedResources::Base
52		52
53	protected	53	protected
54	def collection	54	def collection
55	- @unresolved_counts, @problem_counts = {}, {}
56	- @apps \|\|= begin
57	- apps = end_of_association_chain.all
58	-
59	- # Cache counts for unresolved errs and problems
60	- apps.each do \|app\|
61	- @unresolved_counts[app.id] \|\|= app.problems.unresolved.count
62	- @problem_counts[app.id] \|\|= app.problems.count
63	- end
64	-
65	- # Sort apps by number of unresolved errs, then problem counts.
66	- apps.sort do \|a,b\|
67	- (@unresolved_counts[b.id] <=> @unresolved_counts[a.id]).nonzero? \|\|
68	- (@problem_counts[b.id] <=> @problem_counts[a.id]).nonzero? \|\|
69	- a.name <=> b.name
70	- end
71	- end	55	+ @apps \|\|= end_of_association_chain.all.sort
72	end	56	end
73		57
74	def initialize_subclassed_issue_tracker	58	def initialize_subclassed_issue_tracker
	@@ -80,7 +64,7 @@ class AppsController < InheritedResources::Base		@@ -80,7 +64,7 @@ class AppsController < InheritedResources::Base
80	end	64	end
81	end	65	end
82		66
83	- def initialize_subclassed_notification_service	67	+ def initialize_subclassed_notification_service
84	# set the app's notification service	68	# set the app's notification service
85	if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]	69	if params[:app][:notification_service_attributes] && notification_type = params[:app][:notification_service_attributes][:type]
86	if NotificationService.subclasses.map(&:name).concat(["NotificationService"]).include?(notification_type)	70	if NotificationService.subclasses.map(&:name).concat(["NotificationService"]).include?(notification_type)
	@@ -19,13 +19,13 @@ module BacktraceLineHelper		@@ -19,13 +19,13 @@ module BacktraceLineHelper
19		19
20	def link_to_github(line, text = nil)	20	def link_to_github(line, text = nil)
21	return unless line.app.github_repo?	21	return unless line.app.github_repo?
22	- href = "%s#L%s" % [line.app.github_url_to_file(line.file), line.number]	22	+ href = "%s#L%s" % [line.app.github_url_to_file(line.decorated_path + line.file_name), line.number]
23	link_to(text \|\| line.file_name, href, :target => '_blank')	23	link_to(text \|\| line.file_name, href, :target => '_blank')
24	end	24	end
25		25
26	def link_to_bitbucket(line, text = nil)	26	def link_to_bitbucket(line, text = nil)
27	return unless line.app.bitbucket_repo?	27	return unless line.app.bitbucket_repo?
28	- href = "%s#cl-%s" % [line.app.bitbucket_url_to_file(line.file), line.number]	28	+ href = "%s#cl-%s" % [line.app.bitbucket_url_to_file(line.decorated_path + line.file_name), line.number]
29	link_to(text \|\| line.file_name, href, :target => '_blank')	29	link_to(text \|\| line.file_name, href, :target => '_blank')
30	end	30	end
31		31
1	# encoding: utf-8	1	# encoding: utf-8
2	module NoticesHelper	2	module NoticesHelper
3	def notice_atom_summary(notice)	3	def notice_atom_summary(notice)
4	- render "notices/atom_entry.html.haml", :notice => notice	4	+ render "notices/atom_entry", :notice => notice
5	end	5	end
6	end	6	end
7	-
@@ -0,0 +1,55 @@		@@ -0,0 +1,55 @@
	1	+class IssueCreation
	2	+ include ActiveModel::Validations
	3	+
	4	+ attr_reader :problem, :user, :tracker_name
	5	+
	6	+ delegate :app, :to => :problem
	7	+
	8	+ def initialize(problem, user, tracker_name)
	9	+ @problem = problem
	10	+ @user = user
	11	+ @tracker_name = tracker_name
	12	+ end
	13	+
	14	+ def tracker
	15	+ return @tracker if @tracker
	16	+
	17	+ # Create an issue on GitHub using user's github token
	18	+ if tracker_name == 'user_github'
	19	+ if !app.github_repo?
	20	+ errors.add :base, "This app doesn't have a GitHub repo set up."
	21	+ elsif !user.github_account?
	22	+ errors.add :base, "You haven't linked your Github account."
	23	+ else
	24	+ @tracker = GithubIssuesTracker.new(
	25	+ :app => app,
	26	+ :username => user.github_login,
	27	+ :oauth_token => user.github_oauth_token
	28	+ )
	29	+ end
	30	+
	31	+ # Or, create an issue using the App's issue tracker
	32	+ elsif app.issue_tracker_configured?
	33	+ @tracker = app.issue_tracker
	34	+
	35	+ # Otherwise, display error about missing tracker configuration.
	36	+ else
	37	+ errors.add :base, "This app has no issue tracker setup."
	38	+ end
	39	+
	40	+ @tracker
	41	+ end
	42	+
	43	+ def execute
	44	+ if tracker
	45	+ begin
	46	+ tracker.create_issue problem, user
	47	+ rescue => ex
	48	+ Rails.logger.error "Error during issue creation: " << ex.message
	49	+ errors.add :base, "There was an error during issue creation: #{ex.message}"
	50	+ end
	51	+ end
	52	+
	53	+ errors.empty?
	54	+ end
	55	+end