Commit Graph

21 Commits

Author SHA1 Message Date
Eric Eastwood 439e3f0735 Port semi-linear merge strategy to CE (mostly FE) 2017-09-29 14:13:35 -05:00
Eric Eastwood 59d631371c Add test to check for project settings merge strategies 2017-09-26 15:03:24 -05:00
Phil Hughes 4a67699e6e spec updates 2017-08-29 15:35:49 +01:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Mike Greiling 17342953dd Merge branch '34060-simplified-general-project-settings' into 'master'
34060 Simply general project settings to use expanded panels

Closes #34060

See merge request !12620
2017-08-04 18:56:49 +00:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
tauriedavis d7b8b38db7 try and fix some tests 2017-07-28 15:29:13 +01: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 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
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Michael Kozono e8f2a7007a Fix or workaround spec failure
Not sure why this fixes this error:

```
ActiveRecord::RecordNotUnique:
       PG::UniqueViolation: ERROR:  duplicate key value violates unique constraint "index_routes_on_source_type_and_source_id"
       DETAIL:  Key (source_type, source_id)=(Project, 1) already exists.
       : INSERT INTO "routes" ("source_type", "path", "name", "source_id", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"
```
2017-05-05 12:11:58 -07:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
Michael Kozono f4a2dfb46f Add happy path feature tests for redirect behavior 2017-05-05 12:11:57 -07:00
Clement Ho 49831b5374 Fix project name label's for reference in project settings 2017-01-27 10:33:05 -06:00
Rémy Coutable 7485cec94e
Add a spec and actually display the flash notice
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-16 10:57:15 -05:00
Vincent Composieux af941732ed
Added ability to put emojis into repository name
Added ability to put emojis into repository name
2016-11-12 09:21:23 +01:00
Douglas Barbosa Alexandre ea4d6c87d7 Fix Project#to_param to keep invalid project suitable for use in URLs 2016-07-27 13:52:45 -03:00
Douglas Barbosa Alexandre 7d483f8c03 Add feature specs for edit project settings 2016-07-27 13:52:45 -03:00