Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-07Replaces `tag: true` into `:tag` in the specsJacopo
Replaces all the explicit include metadata syntax in the specs (tag: true) into the implicit one (:tag). Added a cop to prevent future errors and handle autocorrection.
2017-08-15Fix race condition with dispatcher.jsPhil Hughes
The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
2017-07-27Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher
2017-07-27Remove superfluous type defs in specsKeifer Furzland
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-13Enable all feature flags by default in specsBob Van Landuyt
Otherwise some features would go untested in non-specific contexts I did need to disable the `gitlab_git_diff_size_limit_increase`-feature in some specs since we depend on diffs being expandable while the file we are testing on is smaller than the increased limit.
2017-07-06Auto-correct ProjectPathHelper violationsRobert Speicher
2017-06-29Change gitlab_sign_in to sign_in where possibleRobert Speicher
2017-06-20Change `login_as` uses to `gitlab_sign_in`Robert Speicher
2017-06-14Correct RSpec/SingleLineHook cop offensesRobert Speicher
2017-06-02Increase diff limits to 100 KB for collapse and 200 KB overallSean McGivern
This is controlled with the feature flag gitlab_git_diff_size_limit_increase. Both of these limits were basically picked arbitrarily in the first place; disabling the feature flag reverts to the old limits.
2017-05-23Use wait_for_requests to wait all JS requestOswaldo Ferreira
2017-05-10Enable the Style/TrailingCommaInLiteral copRémy Coutable
Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-21Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo
Removed all the unnecessary include of `WaitForAjax` and `ApiHelpers` in the specs. Removed unnecessary usage of `api:true`
2017-02-23Enable Style/MutableConstantDouwe Maan
2017-02-11Fix failing conflicts testAnnabel Dunstone Gray
2016-12-03Reduce base font sizes across appAnnabel Dunstone Gray
2016-10-13Add more tests to check conflicts resolutionAlfredo Sumaran
2016-10-13Improve diff view switching and componentsAlfredo Sumaran
2016-10-13Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran
2016-10-13Refactor JS codeAlfredo Sumaran
- Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
2016-10-13Fix editor specSean McGivern
2016-10-13Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran
2016-10-13We now support resolving conflicts with ambiguous markersDouwe Maan
2016-08-25Handle non-UTF-8 conflicts gracefullySean McGivern
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-17Add workaround for JS error in specSean McGivern
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-12Fix failed test because of a copy change.Fatih Acet
2016-08-12Add more tests for conflictsSean McGivern