Piotr Sarnacki
23035306c7
Oh gaaawwd, really fix the dependencies
2014-06-26 18:09:28 +02:00
Piotr Sarnacki
412baaa79c
Specify proper dependencies in job's and build's properties
2014-06-26 18:01:34 +02:00
Piotr Sarnacki
3d45696f9a
Extract commit data on all build events if it's available
2014-06-26 13:54:08 +02:00
Piotr Sarnacki
1238caf318
Fix signing out on failed try to update user data
...
A while ago I introduced a change to auth code which signs out user on
failed try to get user data. The problem with it was it signed out on
all kind of errors, like network error. I changed the code to log out on
401 status, but I haven't tested it properly, we actually return 403 on
unauthenticated queries for user data.
2014-06-23 15:15:40 +02:00
Piotr Sarnacki
6cb866408d
Don't return finishedAt, startedAt, duration for not started jobs/builds
2014-06-20 16:05:45 +02:00
Piotr Sarnacki
e045ab7481
Remove check of model state in DurationCalculation
...
We no longer need this check, because it was only relevant with Ember
Data. Additionally it was a cause of a travis-ci/travis-ci#1992 , because
of wrong syntax:
unless someFunction false or true
will only check for a result of someFunction with an argument being the
result of `or` expression.
2014-06-20 15:47:37 +02:00
Piotr Sarnacki
e0865756d1
Start running poll whenever isSyncing changes
...
This ensures that timing is not important, ie. if user data is refreshed
later, we can still start running poll() if user is syncing.
2014-06-19 14:40:28 +02:00
Piotr Sarnacki
a64c800423
Bring back refreshUserData when setting user data
...
User data needs to be refreshed on sign in, otherwise we don't have
fresh data regarding isSyncing property and other fields which can
change between refreshing page.
2014-06-19 14:32:48 +02:00
Piotr Sarnacki
2fd1af29ec
Unfold lines before trying to scroll
...
(closes travis-ci/travis-ci#1501 )
2014-06-18 15:36:23 +02:00
Mathias Meyer
ceba629b5c
More subtle coloring for invalid fields.
2014-06-18 09:47:10 +02:00
Mathias Meyer
d3b13d8238
Mark invalid concurrent setting input properly.
...
This adds a CSS class if the content is invalid.
2014-06-17 17:34:00 +02:00
Piotr Sarnacki
00ccb07a49
Fix sync button
2014-06-17 16:39:21 +02:00
Piotr Sarnacki
43e9af77d5
Don't close folds when following logs
2014-06-17 00:50:01 +02:00
Piotr Sarnacki
20e3152dba
Bump log.js
2014-06-17 00:31:02 +02:00
Mathias Meyer
ce9322443c
Merge branch 'master' into mm-concurrent-builds-setting
2014-06-16 15:46:27 +02:00
Mathias Meyer
b3fbb5f5cf
Add setting for number of concurrent builds.
...
Includes a little rework of the settings page to fit in an input
field.
2014-06-16 15:45:03 +02:00
Piotr Sarnacki
1f3f06f60e
Make Auth class global
...
It will allow to extend it in travis-pro-web
2014-06-10 09:13:20 +02:00
Piotr Sarnacki
fe1ced55ba
Merge pull request #284 from travis-ci/ps-router-refactoring
...
Router refactoring
2014-06-03 14:42:38 +02:00
Piotr Sarnacki
f0d6ba2857
Merge pull request #282 from travis-ci/ps-auth-refactoring
...
Refactor auth code
2014-06-03 14:24:23 +02:00
Mathias Meyer
03f73b2105
Wrap commit message body on white space.
...
This prevents long commit messages from bleeding into the data on
the right side of the header.
Fixes travis-ci/travis-ci#2380
2014-06-03 08:07:17 +02:00
Piotr Sarnacki
52dea338ee
Refactor handling accounts
...
This commit changes a way we load accounts for profile view:
* instead of using several views with profile controllers, always use
one view to render hooks. This is achieved by redirecting to
individual account page from main profile page (for example when going
into /profile as a user drogus, the effective address will be
/profile/drogus)
* instead of using observers to wait for accounts to load I just use
promise in ProfileRoute#model which effectively ensures that accounts
are loaded at the time we want to select an individual account
* profile controller is split into profile and account controller
2014-05-28 10:23:39 +02:00
Piotr Sarnacki
459089f0cd
Make profiles code a bit simpler
...
We don't need to nest "profile" tab in account view
2014-05-28 10:23:39 +02:00
Piotr Sarnacki
a39d031925
Don't specify index routes
...
They're generated by default
2014-05-28 10:23:39 +02:00
Piotr Sarnacki
cc8219ba7a
No need to add renderFirstSync method
2014-05-28 10:23:39 +02:00
Piotr Sarnacki
42becfc019
Don't specify outlet name for 'pane' outlets
...
Specyfing "pane" as an outlet name here was a legacy thing. In current
form it doesn't give us anything and results in more code, as we need to
specify outlet everytime we want to render something there.
2014-05-28 10:23:38 +02:00
Piotr Sarnacki
de14a03de1
Simplify logic for displaying 'no builds for repository' error
...
We use promise when fetching a repository which means that any nested
routes already have all the repository data loaded. Thanks to that there
is no need to setup observers, we can check what to render right away in
RepoIndexRoute
2014-05-28 10:23:38 +02:00
Piotr Sarnacki
27ae7c4ec2
No need to name outlet 'main'
2014-05-28 10:23:38 +02:00
Piotr Sarnacki
51b9f02da9
Don't render "flash" as an outlet.
...
Just as with "top", we always render "flash" into flash outlet, so we
can render it straight away.
2014-05-28 10:23:38 +02:00
Piotr Sarnacki
338be594bd
No need to keep "top" as an outlet.
...
We render the same thing for "top" part of the site for every layout,
there is no need to keep it as an outlet, we can just render it
directly.
2014-05-28 10:23:37 +02:00
Piotr Sarnacki
3b1cd4f5c4
Bring back afterSignIn and afterSignIn as actions sent to controller
...
It seems that there is more use cases to cover with this behaviour, for
example when someone enters /auth directly and logs in from there.
2014-05-28 10:22:48 +02:00
Piotr Sarnacki
9dd198ed75
Remove auth logic from redirect in Travis.Route
...
Auth check in redirect duplicates beforeModel logic
2014-05-28 10:22:48 +02:00
Piotr Sarnacki
8d393c2cf7
Remove afterSignIn hook from actions in AuthRoute
...
This is a leftover from previous version of auth code. The purpose of
this code was to redirect to index if we're on auth route and user is
already signed in. This may happen only when we use autoSignIn which is
synchronuous, so it should be fine to just check if user is signed in
and redirect to index there.
2014-05-28 10:22:47 +02:00
Piotr Sarnacki
3544d523d7
Refactor auth code
...
* don't use __container__
* register it as a factory on container and inject into routes and
controller
* avoid afterSignIn errors by checking on hooksTarget, ApplicationRoute
should register itself as a hooksTarget
* keep user info on auth
2014-05-28 10:22:47 +02:00
Mathias Meyer
b134f82fab
Scroll #L links to upper third of the screen.
...
Fixes travis-ci/travis-ci#2276
2014-05-27 12:39:53 +02:00
Piotr Sarnacki
7a044cda89
Set background size for profile backgrounds
2014-05-27 12:09:28 +02:00
Piotr Sarnacki
3ce79ed3cc
Remove unused code
2014-05-23 16:17:08 +02:00
Martin Charles
aa2539c5e2
Converted Image Assets to SVG
...
Some of these assets are from fontawesome:
Font Awesome by Dave Gandy - http://fontawesome.io
2014-05-22 12:40:39 -04:00
Martin Charles
a62649401b
Cleaned Up public
directory
2014-05-22 09:33:28 -04:00
Piotr Sarnacki
67851cef9e
Merge pull request #273 from simi/clean-spec-env
...
Fix JS spec env.
2014-05-21 14:19:03 +02:00
Mathias Meyer
1f53f9d100
Fix spelling error in cancellation.
2014-05-20 07:50:26 +02:00
Mathias Meyer
ba2f00a09a
URL-encode branch name for status images.
...
Camelcased all entries in the status image selection menu for
consistency.
Fixes travis-ci/travis-ci#2265
2014-05-19 13:15:56 +02:00
Piotr Sarnacki
1a0344eeed
Remove RepoLoadingRoute for now
...
This somehow breaks tests, I need to figure out why that happens
2014-05-14 14:38:26 +02:00
Piotr Sarnacki
b280a42804
Sign out only if request for user data returns 401
2014-05-14 14:38:25 +02:00
Martin Charles
387ca82dec
Fixed unnecessary scrollbar
2014-05-13 17:42:27 -04:00
Mathias Meyer
605a7dc799
Slim down the status images popup a whee bit.
2014-05-13 09:17:44 +02:00
Mathias Meyer
494871fe5a
Pull cc.xml URL generation into a helper.
...
Makes it easier to overwrite in pro-web for tokenized URLs.
2014-05-13 08:30:04 +02:00
Josef Šimánek
265dfa1d2d
Fix JS spec env.
...
* remove unnecesary files
* add quint stylesheet
2014-05-12 23:57:08 +02:00
Josh Kalderimis
6d54d9979f
Merge pull request #272 from simi/indicator-fix
...
Fix indicator in accounts.
2014-05-12 22:15:12 +12:00
Josef Šimánek
493518091f
Fix indicator in accounts.
...
Closes #248
2014-05-12 11:55:21 +02:00
Piotr Sarnacki
7558050062
Change Id header into Request on requests list
2014-05-12 11:17:49 +02:00
Piotr Sarnacki
286b945ba9
Style commit message on requests list to be shortend
2014-05-12 11:03:10 +02:00
Piotr Sarnacki
1a0d004aeb
Link commit on requests list to github
2014-05-12 11:03:10 +02:00
Piotr Sarnacki
57edf811b7
Add requests page
2014-05-12 11:03:10 +02:00
Mathias Meyer
d6336a8b36
Fix media queries. I have no idea what I'm doing.
2014-05-12 09:52:05 +02:00
Mathias Meyer
218e0a12fb
Silly first attempt at supporting mobile browsers.
...
This applies some simple fixes to make the build page looks ever
so slight more presentable, but needs some more tuning.
2014-05-12 09:14:17 +02:00
Josh Kalderimis
7db772bc3f
Merge pull request #271 from simi/fix-tests
...
Fix tests broken in 680a0c8
.
2014-05-12 13:07:30 +12:00
Josef Šimánek
862fd4cf1b
Fix tests broken in 680a0c8
.
2014-05-12 03:05:51 +02:00
Josef Šimánek
75d58816ca
Use textarea instead of input for build status images and links.
2014-05-12 02:47:37 +02:00
Josef Šimánek
cf82a50268
Add cc.xml status url.
2014-05-12 02:27:51 +02:00
Josef Šimánek
dfdc392690
Trim status image modal.
...
Closes https://github.com/travis-ci/travis-ci/issues/1900
2014-05-12 02:14:52 +02:00
Mathias Meyer
e093b5b90a
Hide "Show More" when there are no more builds.
...
Fixes travis-ci/travis-ci#1057
2014-05-10 09:39:24 +02:00
Mathias Meyer
e100eea2d8
A lousy attempt at vertically aligning the footer.
...
There's gotta be a better way!
2014-05-09 18:01:22 +02:00
Mathias Meyer
5f46ebbe35
Only show annotations div if there are any.
...
Without any annotations, the div just makes for some good-looking
whitespace.
2014-05-09 13:18:14 +02:00
Mathias Meyer
680a0c8f22
Show running for active jobs, ran when finished.
2014-05-09 12:40:45 +02:00
Mathias Meyer
2f455c1f4a
Restore a better margin for commit body.
...
Looks off in Safari, probably needs a proper wrapper element
to make sure everything stays in place.
2014-05-09 11:30:23 +02:00
Mathias Meyer
6939ede1b7
Give the branch more space.
2014-05-09 10:56:49 +02:00
Mathias Meyer
7e6e5ba00e
Fix tests.
2014-05-09 10:30:00 +02:00
Mathias Meyer
49c794c533
Fine tuning for branch name and subject.
...
In Chrome, it looked slightly off, the line-height adjustment
seems to fix it.
2014-05-09 10:28:35 +02:00
Mathias Meyer
2bc3d4d488
Don't break the branch name.
...
If it's too long, we'll hide the rest.
2014-05-09 08:04:34 +02:00
Mathias Meyer
8fac690236
Fix font in the "Sync Now" button.
2014-05-09 07:42:40 +02:00
Josef Šimánek
ca2ac4562a
Update jobs summary to new format.
2014-05-09 05:52:18 +02:00
Josef Šimánek
141619c3f5
Show committer in build header only when he's not author.
2014-05-09 04:28:58 +02:00
Josef Šimánek
b8bd3b5fe8
Remove unnecessary ; from spec_helper.
2014-05-09 04:28:44 +02:00
Josef Šimánek
a934267b86
Use gravatar for author and committer avatars.
2014-05-09 02:20:34 +02:00
Mathias Meyer
13b9bc6cce
Slightly increased font size for times.
2014-05-08 17:36:57 +02:00
Mathias Meyer
bf84301710
Improve spacing for octocats.
2014-05-08 17:11:15 +02:00
Mathias Meyer
e1bd111224
Change summary on job page, fix more tests.
...
This brings both pages on par, though the duplication isn't ideal.
2014-05-08 16:31:33 +02:00
Mathias Meyer
1373308475
Delete old summary, fix tests for the builds page.
...
This commit breaks tests for the job page, but bear with me. It
doesn't have the new layout yet.
2014-05-08 16:00:28 +02:00
Mathias Meyer
882d479c0f
Fix compare link text for tags.
2014-05-08 15:31:27 +02:00
Mathias Meyer
1ceb935e19
Shorter commits for compare URLs, optimize footer.
...
The flow when reducing the browser width isn't fully right yet,
but we're getting there.
2014-05-08 13:21:45 +02:00
Mathias Meyer
744e32a15c
Add footer section for commit and author details.
2014-05-08 12:37:00 +02:00
Mathias Meyer
4554ca3c0b
Underline links in the commit body.
2014-05-08 11:20:06 +02:00
Mathias Meyer
a6d6e40f9c
Initial version of a new build header.
...
Based on @Juice10's original designs at travis-ci/travis-assets#24 .
2014-05-08 11:08:38 +02:00
Mathias Meyer
3b2e8d69f3
Extend LinkView to allow click tracking.
...
Allows us to hook in to certain links and see how they're used.
2014-05-08 09:36:31 +02:00
Mathias Meyer
80b3c2c826
Let the add repository button float on the right.
2014-05-06 14:56:39 +02:00
Mathias Meyer
781a99edd8
Add button to add a new repository from sidebar.
...
It's currently not obvious where to click to add a new repository,
and if anything, we should make it easier for people to set up
new repositories.
2014-05-06 14:46:52 +02:00
Mathias Meyer
21cbd7c0c3
It's Log not Logs.
2014-05-06 14:00:42 +02:00
Mathias Meyer
dfc5d60173
Fix some wording for the log view.
...
Capitalized makes more sense and it's a single log, hence
the singularization.
2014-05-06 13:55:34 +02:00
Piotr Sarnacki
66e93ed3ab
Limit flash messages to 2
...
(closes travis-ci/travis-ci#1859 )
2014-05-06 11:39:36 +02:00
Mathias Meyer
c43aa7bdac
Rearrange items on the first sync page.
...
The success message would originally show up below the message
that we're synchronizing. This change shows either the information
or the success message.
2014-05-06 10:22:50 +02:00
Mathias Meyer
2fa2ea533b
Fix repository hint on accounts pages.
...
Accounts and the profile are currently separate controllers, so
whenever you switched the account, the message would be hidden.
2014-05-06 10:10:36 +02:00
Mathias Meyer
2e6e896c74
Use correct font for follow log button.
2014-05-06 08:05:53 +02:00
Piotr Sarnacki
31cb3c0bb5
Prevent sending double restart request
...
When requeue icon was clicked 2 times it was sometimes the case that we
sent 2 requests. This commit prevents that and also adds a little nice
indicator instead of restart button while we're sending the request.
2014-05-05 15:37:08 +02:00
Mathias Meyer
2172fb705a
Trim the commit message.
2014-05-05 10:13:54 +02:00
Mathias Meyer
35fc98edaf
Only show message body when it exists.
...
Otherwise the script will return the message subject again rather
than show nothing at all.
2014-05-05 10:02:30 +02:00
Mathias Meyer
4fa2ade298
Show xcode_sdk and scheme as matrix dimensions.
...
Fixes travis-ci/travis-ci#2177 .
2014-05-05 08:27:09 +02:00
Mathias Meyer
74b6f14ab0
Decrease line height for commit body slightly.
...
18px seems like a good compromise between ASCII art and
readability.
2014-05-03 20:16:45 +02:00
Mathias Meyer
22130f8328
Wrap commit body into a pre tag.
...
This follows the idea that the message can contain useful things
like ASCII diagrams or wonderful art.
Related to travis-ci/travis-ci#2003 .
2014-05-03 19:59:20 +02:00
Mathias Meyer
42539d94de
Set whitespace handling via CSS.
...
Relevant for travis-ci/travis-ci#2003 .
2014-05-03 18:04:31 +02:00
Mathias Meyer
2a40ba59a7
Replace leading whitespace in commit message.
...
This allows for proper indentation to display ASCII art.
Fixes travis-ci/travis-ci#2003
2014-05-03 17:59:01 +02:00
Henrik Hodne
8926d4e6c0
Add ruby
as a known matrix key
2014-05-01 21:07:53 -05:00
Sven Fuchs
b6566cbf1c
update log.js from travis-web-log
2014-04-30 14:59:40 +02:00
Hiro Asari
6500a58d04
Merge pull request #262 from wearhere/jeff/underlining
...
Style the "underline" class.
2014-04-29 21:30:19 -04:00
Piotr Sarnacki
46e325c7bd
Disable tailing specs for now
2014-04-16 09:58:36 +02:00
Piotr Sarnacki
4024de35cc
Update pusher to 2.2.0
2014-04-16 09:38:23 +02:00
Hiro Asari
9b323e4b55
[skip ci] Tweak wording on .travis.yml-only build feature
2014-04-09 19:57:49 -04:00
Piotr Sarnacki
1d06666357
signOut on refresh user data error
2014-04-09 00:14:28 +02:00
Henrik Hodne
433f5b7318
Use link-to instead of the deprecated linkTo
...
These were mostly removed in 8d681e85af
,
but some where left over.
2014-04-01 00:56:31 -05:00
Piotr Sarnacki
9e167b6603
Calculate position of #tail element rather than setting position fixed
...
This change ought to be commited along with 535a873
, but due to a bit of
chaos with reverts and merging it's not in the master branch. This fixes
a position calculation of #tail element on the log to work even with
right sidebar (which is a problem on Travis Pro)
2014-03-27 12:37:15 +01:00
Jeff Wear
3fb40b4d4b
Style the "underline" class. (refs travis-ci/travis-ci#2047 )
...
And remove the unused "underscore" class.
2014-03-23 16:27:08 -07:00
Mathias Meyer
641199cf7d
Switch build status image URL to SVG.
2014-03-20 07:25:05 +01:00
Mathias Meyer
34c07325d3
Add a message for travis-ci.com as well.
...
Switched the logic around to make a bit more sense with the
configuration conditionals.
2014-03-18 10:44:34 +01:00
Mathias Meyer
aaf777ce9d
Show a message pointint to travis-ci.com.
...
Reduces friction a whee bit in finding your private repositories.
2014-03-18 10:40:30 +01:00
Mathias Meyer
c294dcf793
Make explanation box smaller, left-align text.
2014-03-10 12:50:31 +01:00
Mathias Meyer
f44e3eadb3
Provide more copy for insufficient oauth permissions.
2014-03-10 12:45:52 +01:00
Piotr Sarnacki
a141f4b8a4
Update pusher to 2.2.0-rc2
2014-03-05 11:14:34 +01:00
Piotr Sarnacki
10271e2915
Use outerheight when calculating position to take padding into account
2014-03-04 15:34:10 +01:00
Piotr Sarnacki
0ef732557c
Remove unneeded console.log
2014-03-04 14:14:00 +01:00
Piotr Sarnacki
535a873dc0
Make "to top" link visible when scrolling through the log
...
These are the changes by @dmathieu (reverted at d7bef2b
) slightly
changed to allow us to use them also on Travis Pro.
The change is to still use onScroll calculations in order to position
elements instead of using "position: fixed". The latter method is harder
to use when element needs to be positioned relatively to other element -
on Pro we would have to still calculate the position because of the
right sidebar.
2014-03-04 14:07:33 +01:00
Piotr Sarnacki
b4f3eac0bf
Merge pull request #259 from rjackson/update-ember
...
Update to Ember 1.4.0.
2014-03-04 11:40:22 +01:00
Mathias Meyer
c8a348c5b6
Set all flex vendor attributes when maximized.
2014-03-03 17:36:08 +01:00
Piotr Sarnacki
a060b08552
Use not minified pusher, it's easier to debut and we minify it anyway
2014-02-27 20:53:24 +01:00
Piotr Sarnacki
046abf397c
Don't silence pusher warnings
2014-02-27 19:16:40 +01:00
Piotr Sarnacki
be0f601a4c
Subscribe in a way which is currently documented in pusher docs
2014-02-27 19:16:40 +01:00
Piotr Sarnacki
077f555af3
Update pusher to 2.2.0-rc1
2014-02-27 19:16:39 +01:00
Mathias Meyer
c8b6ecb101
Fix link to docs.
...
[ci skip]
2014-02-26 23:11:14 +01:00
Piotr Sarnacki
b5963ba31d
Remove the rest of text stubs in insufficient oauth permissions
2014-02-25 11:17:52 +01:00
Piotr Sarnacki
78ff50ce68
Remove existing user text stub on insufficient oauth permissions page
2014-02-24 23:46:24 +01:00
Piotr Sarnacki
39b8af12f9
Merge branch 'insufficient-oauth-permissions'
...
Conflicts:
assets/scripts/app/routes.coffee
2014-02-24 23:33:14 +01:00
Piotr Sarnacki
7ef7da5535
Redirect to getting started only from index route
...
Also rename renderNoOwnedRepos to redirectToGettingStarted
2014-02-20 15:28:38 +01:00
Piotr Sarnacki
8c513fd7d2
Use action bubbling instead of checking for contructor in AuthRoute
2014-02-19 16:17:31 +01:00
Mathias Meyer
98f1e62047
Decrease line-height for switches.
...
The label not being vertically centered was driving me mad.
2014-02-18 11:56:20 +01:00
Mathias Meyer
b2bfb6c3e9
Rename properties/bindings for unadministerable hooks.
2014-02-18 11:56:19 +01:00
Mathias Meyer
81cf02cd3b
It's GitHub.
2014-02-18 11:56:19 +01:00
Piotr Sarnacki
f123162627
Use Em.computed.sort and Em.computed.limit instead of nesting proxies
...
With new array computed helpers we can simplify code and get rid of
nested array proxies.
2014-02-18 10:13:41 +01:00
Piotr Sarnacki
36db80d45f
Add Ember.computed.limit and use it in LimitedArray
...
arrayComputed was added recently in order to make array computations
easier. Using arrayComputed we can improve LimitedArray which now uses
an isolated multipurpose Ember.computed.limit.
2014-02-18 10:00:33 +01:00
Piotr Sarnacki
8e040912ec
Still redirect to getting started, but render it in 'main' outlet
...
Rendering views outside of routes cycle seems problematic at the moment,
so redirection is our best bet. However, the way I initially did it in
cc90200
causes problems for people who don't have any own repositories
set up for Travis CI, but still want to log in and browse around -
rendering getting started page as a full page hides left sidebar with a
list of repositories.
This commit changes getting started page to render in the main outlet,
just as before redirection changes.
2014-02-17 11:26:28 +01:00
Robert Jackson
69d566b1a1
Update to Ember 1.4.0.
2014-02-15 21:28:02 -05:00
Piotr Sarnacki
cc90200d66
Instead of rendering getting started page, just redirect to it
...
It would be nice to allow to just render getting started page, but
because of the way we manage layouts, it's hard to get it running
without weird bugs popping up now and then. This should be easier to
achieve once the templates are cleaned up to use better laout
management.
2014-02-13 15:51:38 +01:00
Piotr Sarnacki
a1c42482b6
Render getting started page into application level
2014-02-13 15:26:52 +01:00
Piotr Sarnacki
9bd9ab2b0a
Make sure that menu is on top
2014-02-13 12:28:55 +01:00
Piotr Sarnacki
bbba892e7b
Don't automatically toggle hook switches
...
Hook switches are toggled in the controller "toggle" action, so if we
toggle them in the component and then in the controller, it will just
return to the original state.
2014-02-12 17:58:19 +01:00
Piotr Sarnacki
0679fc260c
Revert "Revert "Use switches on settings pane""
...
This reverts commit e5ae06afeb
.
2014-02-12 17:33:42 +01:00
Henrik Hodne
e5ae06afeb
Revert "Use switches on settings pane"
...
This reverts commit 357b176f93
.
This commit seems to be where the bug with enabling hooks was
introduced, and reverting this commit seems to fix that bug.
Conflicts:
assets/scripts/app/controllers.coffee
assets/scripts/app/templates/repo/settings.hbs
2014-02-12 09:55:24 -06:00
Henrik Hodne
2450f9fe9d
Revert previous revert
...
I found the commit that caused the bug that caused me to do the last
revert. I'm therefore reverting the previous revert and I will be
committing a revert that reverts the commit that introduced the bug. See
next commit.
This reverts commit db2d38a7af
.
2014-02-12 09:54:24 -06:00
Henrik Hodne
db2d38a7af
Revert setting panel deploy
...
This seems to have caused issues with enabling the hooks for
repositories.
2014-02-12 09:14:47 -06:00
Piotr Sarnacki
3426a8b95f
Notify only on error when saving settings
2014-02-12 13:17:26 +01:00
Piotr Sarnacki
8d19410264
Merge remote-tracking branch 'origin/settings-pane'
...
Conflicts:
assets/scripts/app/controllers.coffee
assets/scripts/app/routes.coffee
assets/scripts/app/views/repo/show.coffee
2014-02-12 11:52:01 +01:00
Piotr Sarnacki
f29ee2372a
Fix specs
...
Change in mocks.coffee broken specs - using repos variable was shadowing
global repos array.
2014-02-12 10:37:07 +01:00
Piotr Sarnacki
ce74220f28
Don't reopen Ember.Route
...
A better way is to provide Travis.Route, which will be used by default
when generating route objects.
There is also no need to define actions for all the routes as they are
needed only in ApplicationRoute (ie. when they're not handled by other
routes).
2014-02-12 08:55:55 +01:00