991a295378
Add latest changes from gitlab-org/gitlab@master
2019-11-11 00:06:26 +00:00
12287a65b7
Add latest changes from gitlab-org/gitlab@master
2019-10-24 06:07:07 +00:00
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
6a3a28bfde
Fixed the blob editor deleting all content for files
...
This only happens for files that the path consists of only numbers
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58578
2019-03-07 12:35:07 +00:00
079d471e8e
Merge branch 'web-ide-default-editor' into 'master'
...
Makes the Web IDE the default editor
Closes #42382
See merge request gitlab-org/gitlab-ce!25171
2019-02-27 09:43:53 +00:00
e9b28a28a7
Makes the Web IDE the default editor
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42382
2019-02-26 12:21:16 +00:00
f49aeacdd0
Merge branch 'fix-misspellings-app-comments' into 'master'
...
Fix misspellings in app/spec comments
See merge request gitlab-org/gitlab-ce!25517
2019-02-26 12:25:01 +01:00
cae2c33681
Revert "Merge branch 'fix-misspellings-app-comments' into 'master'"
...
This reverts commit 9202bbd1294b282e9ce1
2019-02-25 12:53:09 -08:00
bbf479a36c
Fix misspellings in app/spec comments
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-02-25 17:25:19 +09:00
b2c70230b3
Remove Redcarpet markdown engine
...
This engine was replaced with CommonMarker in 11.4, it was deprecated
since then.
2019-02-04 12:48:35 +01:00
a963721f79
render using RedCarpet if legacy_render parameter is set
2018-09-05 09:19:16 -05:00
a63bce1a4b
Resolve "Rename the `Master` role to `Maintainer`" Backend
2018-07-11 14:36:08 +00:00
3db2f32759
Enable Capybara/FeatureMethods cop
2018-07-05 06:32:05 +00:00
f7811b4b0b
Replace $.post in edit blob with axios
2018-01-29 17:53:48 +00:00
27c95364b5
Replace '.team << [user, role]' with 'add_role(user)' in specs
2017-12-22 19:18:28 +11:00
43377979c6
Check for element before evaluate_script
...
Tip from
https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
2017-10-19 14:01:15 -05:00
0ce6785851
Replaces `tag: true` into `:tag` in the specs
...
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-10-07 13:57:54 +02:00
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
7e113b6824
Remove superfluous type defs in specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
05e152fa7f
Fix the :project factory by not copying the test repo twice
...
Also, fixing some calls to the :project factory with the :test_repo
trait since this trait is already included in the :project factory.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 09:58:06 +02:00
9eeba8fb49
Auto-correct ProjectPathHelper violations
2017-07-06 12:20:50 -04:00
e939bf7be1
Change gitlab_sign_in to sign_in where possible
2017-06-29 12:18:23 -04:00
45fb1f9542
Change `login_as` uses to `gitlab_sign_in`
2017-06-19 18:59:01 -05:00
b38c74d696
Revert 'New file from interface on existing branch'
2017-06-09 10:10:47 -05:00
2338785ec9
Use wait_for_requests to wait all JS request
2017-05-22 20:39:49 -03:00
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
7592137f21
Fix rspec and spinach tests
2017-04-06 14:58:57 -05:00
b42dc1a52b
Linking to edit file directly
2017-04-06 16:36:38 +00:00
742cee756b
Merge branch 'jej-22869' into 'security'
...
Fix information disclosure in `Projects::BlobController#update`
It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md ) entry added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html )
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
https://gitlab.com/gitlab-org/gitlab-ce/issues/22869
See merge request !2023
2016-11-28 21:25:18 -03:00
GitLab Bot
Thong Kuah
Phil Hughes
Filipa Lacerda
Rémy Coutable
Michael Kozono
Takuya Noguchi
Jan Provaznik
Brett Walker
Mark Chao
Winnie Hellmann
Clement Ho
blackst0ne
Eric Eastwood
Jacopo
Robert Speicher
Keifer Furzland
Douwe Maan
Oswaldo Ferreira
Jose Ivan Vargas
Douwe Maan