Commit graph

8 commits

Author SHA1 Message Date
Robert Speicher
9eeba8fb49 Auto-correct ProjectPathHelper violations 2017-07-06 12:20:50 -04:00
Robert Speicher
e939bf7be1 Change gitlab_sign_in to sign_in where possible 2017-06-29 12:18:23 -04:00
Robert Speicher
45fb1f9542 Change login_as uses to gitlab_sign_in 2017-06-19 18:59:01 -05:00
Jacopo
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
Douwe Maan
d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Jose Ivan Vargas
7592137f21 Fix rspec and spinach tests 2017-04-06 14:58:57 -05:00
Lin Jen-Shin
a639454032 Fix renaming 2017-01-07 00:31:11 +08:00
Frank West
ade0c2c892 Prevents accidental overwrites of commits from UI
Currently when a user performs an update of a file through the UI  and there
has already been a change committed to the file the previous commits will be
overwritten without a check to see if the file has been changed.

This commit uses the last commit sha at the time the user starts editing the
file and compares it with the current sha of the file being edited to ensure
they are the same before committing the file. If the shas do not match we
throw an exception preventing the commit from the commit from occurring.

Fixes #5857
2016-08-15 02:34:55 +00:00