Commit Graph

22 Commits

Author SHA1 Message Date
GitLab Bot 24623a9743 Add latest changes from gitlab-org/gitlab@master 2023-06-28 15:09:19 +00:00
GitLab Bot fc4faf47ac Add latest changes from gitlab-org/gitlab@master 2023-05-25 12:07:22 +00:00
GitLab Bot f6a4346585 Add latest changes from gitlab-org/gitlab@master 2023-04-03 09:10:48 +00:00
GitLab Bot 35e5a7c845 Add latest changes from gitlab-org/gitlab@master 2022-11-25 15:09:28 +00:00
GitLab Bot 706338ea16 Add latest changes from gitlab-org/gitlab@master 2022-01-25 00:11:49 +00:00
GitLab Bot 4f5c8572e9 Add latest changes from gitlab-org/gitlab@master 2020-06-16 18:09:01 +00:00
Thong Kuah 73e848850c Add frozen_string_literal to spec/features
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:23:30 +12:00
Rémy Coutable 13f7415afd Address review feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-09 18:04:09 -05:00
Rémy Coutable 2d54dfb251 Migrate features/project/project.feature to RSpec and reorganize several Project feature specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-09 18:04:09 -05:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Robert Speicher 1a0064dceb Use `empty_project` where possible in spec/features/projects 2017-07-27 13:12:16 -04:00
Keifer Furzland 7e113b6824 Remove superfluous type defs in specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Robert Speicher eef068754a Merge branch 'master' into rs-sign_in 2017-07-06 12:43:51 -04:00
Robert Speicher 9eeba8fb49 Auto-correct ProjectPathHelper violations 2017-07-06 12:20:50 -04:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05: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