ff76adb547
Unnecessary "include WaitForAjax" and "include ApiHelpers"
...
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs.
Removed unnecessary usage of `api:true`
2017-04-21 22:32:02 +02:00
b7d8df503c
Enable Style/MutableConstant
2017-02-23 09:31:56 -06:00
465316ec22
Fix failing conflicts test
2017-02-10 15:09:08 -06:00
436ea57f56
Reduce base font sizes across app
2016-12-02 17:24:08 -06:00
54bfe70795
Add more tests to check conflicts resolution
2016-10-13 14:16:35 -05:00
f947972ded
Improve diff view switching and components
2016-10-13 14:16:35 -05:00
197ac5ebbf
Ability to resolve conflicts for files with `text-editor` as conflict type
2016-10-13 14:16:35 -05:00
a8ac9089af
Refactor JS code
...
- Use a store base object to manage application state.
- Add a service to handle ajax requests.
- Load code only when needed
2016-10-13 14:16:35 -05:00
e84f959ae4
Fix editor spec
2016-10-13 14:16:35 -05:00
4178ddee18
Add tests to check if files are resolved with Edit Inline mode
2016-10-13 14:16:35 -05:00
6af52d7d23
We now support resolving conflicts with ambiguous markers
2016-10-13 14:16:34 -05:00
44eb3197a9
Handle non-UTF-8 conflicts gracefully
...
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
2016-08-25 08:27:08 +01:00
7cb76ce1c6
Add workaround for JS error in spec
...
These JS errors are only thrown in PhantomJS, and enough of the page is
rendered properly that this spec passes. We should remove this in
future.
2016-08-17 11:15:05 +01:00
f6aa91700a
Fix failed test because of a copy change.
2016-08-12 23:24:51 +03:00
ce7eb4e492
Add more tests for conflicts
2016-08-12 23:24:48 +03:00
Jacopo