James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

behaviors

Allow manual resize of js-autosize textareas

2016-02-01 17:00:03 -05:00

extensions

Add JS specs for Array extensions

2015-06-02 20:32:07 -04:00

fixtures

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

graphs

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

issue_spec.js.coffee

Update issue_spec test

2016-04-05 13:13:49 -07:00

line_highlighter_spec.js.coffee

Apply new design to files page

2015-10-13 16:41:48 +02:00

merge_request_spec.js.coffee

reverting more MR ajax files, will appear in different commit

2016-01-12 14:55:54 -05:00

merge_request_tabs_spec.js.coffee

Fix the "Reload with full diff" URL button

2015-07-23 12:53:54 -07:00

merge_request_widget_spec.js.coffee

Fix build notification on merge request page change even if the build status didn't change

2016-05-08 21:41:09 +02:00

new_branch_spec.js.coffee

Fix NewBranchForm spec

2015-12-24 15:09:29 +01:00

notes_spec.js.coffee

Placeholder on milestone form

2016-04-14 10:28:05 +01:00

project_title_spec.js.coffee

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

right_sidebar_spec.js.coffee

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

shortcuts_issuable_spec.js.coffee

Remove jasmine-fixture, use teaspoon fixtures

2015-05-28 18:22:32 -04:00

spec_helper.coffee

Require jquery.turbolinks in all JS specs

2015-10-07 15:23:41 -04:00

syntax_highlight_spec.js.coffee

Add specs for syntax_highlight JS

2015-09-10 15:38:24 -04:00

zen_mode_spec.js.coffee

Refactor ZenMode

2016-01-08 23:36:09 -05:00