Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #943

Merged
merged 16 commits into from
Apr 20, 2016
Merged

Upgrade dependencies #943

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c6cf473
Updated codemirror to v5.11
dtsn Feb 10, 2016
fdae5e2
Updated the version to 1.1.18
dtsn Feb 10, 2016
37c5e6a
Include CodeMirror as npm dependency
dereklieu Mar 27, 2016
cf29e8c
Regression tests for CodeMirror API
dereklieu Mar 27, 2016
2b84e83
Remove only from meta-forms test
dereklieu Apr 19, 2016
8cfdfa0
Regression test shows selection of wrong repo
dereklieu Apr 19, 2016
01fb417
Choose the repo that matches the login name, if it exists
dereklieu Apr 19, 2016
d89cd7c
Regression test for selections
dereklieu Apr 19, 2016
e6baf49
Include syntax highlighting
dereklieu Apr 19, 2016
639f60d
Upgrade mocha, mocha-phantomjs, phantomjs versions
dereklieu Apr 20, 2016
c7e5b69
Reference newer versions of mocha, chai; remove unneeded polyfills
dereklieu Apr 20, 2016
7b758fd
Use _.find so old browsers dont complain
dereklieu Apr 20, 2016
480e5f4
Standardize how we run tests
dereklieu Apr 20, 2016
89f9af6
Remove unneeded global assignments
dereklieu Apr 20, 2016
d9206c7
Fix odd issue with cloning when testing views/file#draft
dereklieu Apr 20, 2016
658dbf4
Use the right ci-test command, peg it to node#4.2
dereklieu Apr 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Choose the repo that matches the login name, if it exists
  • Loading branch information
@dereklieu
dereklieu committed Apr 19, 2016
commit 01fb4175dd3eefa0c8a79e5aabcb3259f356321d
18 changes: 17 additions & 1 deletion app/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,23 @@ module.exports = Backbone.Router.extend({
this.users.add(user);
}

var repo = user.repos.findWhere({ name: repoName });
// If user has access to repos with the same name,
// use the repo that matches the login/url, if available.
// https://github.com/prose/prose/issues/939
var repos = user.repos.filter(function (model) {
return model.get('name') === repoName;
});
var repo;
if (repos.length === 1) {
repo = repos[0];
} else if (repos.length > 1) {
// Returns false if there isn't a repo with a matching login.
// We're fine with that since _.isUndefined(false) === true
repo = repos.find(function (model) {
return model.get('owner').login === login;
});
}

if (_.isUndefined(repo)) {
repo = new Repo({
name: repoName,
Expand Down