root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
109,424 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

138 Commits

Author SHA1 Message Date
GitLab Bot 6f15c2c272 Add latest changes from gitlab-org/gitlab@master 2020-09-24 12:09:37 +00:00
GitLab Bot f3352dd3f1 Add latest changes from gitlab-org/gitlab@master 2020-09-18 21:10:11 +00:00
GitLab Bot eef9c80f1c Add latest changes from gitlab-org/gitlab@master 2020-08-27 15:10:21 +00:00
GitLab Bot 2f5731cf53 Add latest changes from gitlab-org/gitlab@master 2020-08-19 18:10:34 +00:00
GitLab Bot bfce95a4c5 Add latest changes from gitlab-org/gitlab@master 2020-08-18 21:09:57 +00:00
GitLab Bot 3ce55b46df Add latest changes from gitlab-org/gitlab@master 2020-07-22 18:09:27 +00:00
GitLab Bot 7cd0959043 Add latest changes from gitlab-org/gitlab@master 2020-07-11 06:09:15 +00:00
GitLab Bot a0b26c6df5 Add latest changes from gitlab-org/gitlab@master 2020-06-29 12:09:20 +00:00
GitLab Bot 235dc61f47 Add latest changes from gitlab-org/gitlab@master 2020-06-19 12:09:07 +00:00
GitLab Bot b9f288cdfa Add latest changes from gitlab-org/gitlab@master 2020-06-19 00:09:12 +00:00
GitLab Bot 4f5c8572e9 Add latest changes from gitlab-org/gitlab@master 2020-06-16 18:09:01 +00:00
GitLab Bot 31a432e38a Add latest changes from gitlab-org/gitlab@master 2020-06-03 09:08:47 +00:00
GitLab Bot 5064bf8c56 Add latest changes from gitlab-org/gitlab@master 2020-03-25 09:08:11 +00:00
GitLab Bot 8957ace315 Add latest changes from gitlab-org/gitlab@master 2020-03-14 00:09:30 +00:00
GitLab Bot d80f3cd75e Add latest changes from gitlab-org/gitlab@master 2020-03-04 09:08:20 +00:00
GitLab Bot a89cb5cbdd Add latest changes from gitlab-org/gitlab@master 2020-02-06 21:08:48 +00:00
GitLab Bot 5564275a0b Add latest changes from gitlab-org/gitlab@master 2020-02-06 12:10:29 +00:00
GitLab Bot db24ab2b72 Add latest changes from gitlab-org/gitlab@master 2020-01-28 12:08:44 +00:00
GitLab Bot 4ce0bee95d Add latest changes from gitlab-org/gitlab@master 2020-01-14 12:07:41 +00:00
GitLab Bot e1867c38fc Add latest changes from gitlab-org/gitlab@master 2019-12-06 18:07:44 +00:00
GitLab Bot 921d16124a Add latest changes from gitlab-org/gitlab@master 2019-11-14 18:06:15 +00:00
GitLab Bot 69944ffb68 Add latest changes from gitlab-org/gitlab@master 2019-11-12 15:06:26 +00:00
GitLab Bot 991a295378 Add latest changes from gitlab-org/gitlab@master 2019-11-11 00:06:26 +00:00
GitLab Bot 12287a65b7 Add latest changes from gitlab-org/gitlab@master 2019-10-24 06:07:07 +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
Thong Kuah 4ec16912b8 Autocorrect with RSpec/ExampleWording cop 
- rewords examples starting with 'should'
- rewords examples starting with 'it'

Note: I had to manually fixup "onlies" to "only"
 2019-04-05 08:43:27 +00:00
Phil Hughes 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
Yorick Peterse 59db98a0ca
Merge dev master into GitLab.com master 2019-03-04 19:44:46 +01:00
Yorick Peterse 6e1f0852fe Merge branch 'security-osw-stop-linking-to-packages' into 'master' 
Stop linking to unrecognized package sources

See merge request gitlab/gitlabhq!2933
 2019-03-04 18:36:39 +00:00
Filipa Lacerda 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
Phil Hughes 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
Rémy Coutable 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
Michael Kozono cae2c33681
Revert "Merge branch 'fix-misspellings-app-comments' into 'master'" 
This reverts commit 9202bbd129, reversing
changes made to 4b282e9ce1.
 2019-02-25 12:53:09 -08:00
Takuya Noguchi bbf479a36c Fix misspellings in app/spec comments 
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
 2019-02-25 17:25:19 +09:00
Oswaldo Ferreira 445709345f Stop linking to unrecognized package sources 2019-02-21 16:17:38 -03:00
Jan Provaznik 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
Robert Speicher 14a27a4f40
Correct usage of the have_link matcher 
The second option to this matcher should be an options hash; anything
else is just ignored, which can lead to false positives in tests.

We see one such false positive in the "Learn more" link test in
`spec/features/projects/blobs/blob_show_spec.rb`.
 2018-09-14 15:36:40 -05:00
Brett Walker a963721f79 render using RedCarpet if legacy_render parameter is set 2018-09-05 09:19:16 -05:00
Jan Provaznik 21a8cc2c2a Fix specs failing on duplicate gpg signature 
It seems there are additional async requests related to gpg
signature, w/o waiting for finishing all requests it fails on:
Duplicate entry '...' for key 'index_gpg_signatures_on_commit_sha'
 2018-08-13 07:35:50 +02:00
Rémy Coutable c732433d90 Merge branch 'rails5-fix-duplicate-gpg-signature' into 'master' 
Rails5 fix specs duplicate key value violates unique constraint…

See merge request gitlab-org/gitlab-ce!21119
 2018-08-10 09:01:16 +00:00
Jasper Maes 80b77b6d24 Rails5 fix specs duplicate key value violates unique constraint 'index_gpg_signatures_on_commit_sha' 2018-08-09 21:20:11 +02:00
Winnie Hellmann fed97a68b9 Fix GPG status badge loading regressions 2018-08-07 14:58:53 +02:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Winnie Hellmann 3db2f32759 Enable Capybara/FeatureMethods cop 2018-07-05 06:32:05 +00:00
Lin Jen-Shin 2b92cca855 Unify spec/features/projects/blobs/blob_show_spec.rb 2018-05-22 18:30:48 +08:00
Bob Van Landuyt 35a49922e6 Allow admins to push to empty repos 2018-04-24 14:06:59 +02:00
Mayra Cabrera e2e0a4d157 Include feature spec for realtime pipeline 2018-03-14 13:31:40 -06:00
Jose Ivan Vargas 52c79bc8b3 Add realtime pipeline status component for files 2018-03-14 13:31:32 -06:00
Clement Ho f7811b4b0b Replace $.post in edit blob with axios 2018-01-29 17:53:48 +00:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Travis Miller 1760e377d8 Add edit button to mobile file view 2017-11-22 10:52:34 -06:00
Eric Eastwood 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
Jacopo 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
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04: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
Rémy Coutable 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
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
Stan Hu 516a3b7880 Revert "Annotate" to "Blame" 2017-06-22 17:07:19 -07:00
Robert Speicher 45fb1f9542 Change `login_as` uses to `gitlab_sign_in` 2017-06-19 18:59:01 -05:00
Douwe Maan 7944254563 Implement diff viewers 2017-06-14 10:12:21 -05:00
Douwe Maan b38c74d696 Revert 'New file from interface on existing branch' 2017-06-09 10:10:47 -05:00
Douwe Maan 370bc86fb0 Detect if file that appears to be text in the first 1024 bytes is actually binary afer loading all data 2017-06-08 12:49:03 -05:00
Ilya Vassilevsky 3801dc0e6e Promote blameless culture by using "annotate" instead 
User-facing changes (fast & easy win)
 2017-06-02 08:48:02 +04:00
Oswaldo Ferreira 2338785ec9 Use wait_for_requests to wait all JS request 2017-05-22 20:39:49 -03:00
Douwe Maan 1ede99571b Fix inaccurate code comment 2017-05-18 09:11:23 -05:00
Douwe Maan 24b105e2e1 Add auxiliary blob viewers to dependency files 2017-05-17 14:10:00 -05:00
Douwe Maan 08706f6837 Implement auxiliary blob viewers 2017-05-10 20:07:04 -05:00
Douwe Maan 720cc14a75 Refactor Blob support of external storage in preparation of job artifact blobs 2017-05-03 10:20:05 -05:00
Phil Hughes 0c83f747ec Fixed PDF blob specs 
The PDF file is no longer included in the repo, so we need to create the PDF before running the tests
 2017-05-02 10:37:57 +01:00
Douwe Maan 54040ce066 Show Raw button as Download for binary files 2017-04-30 14:06:21 -05:00
Douwe Maan 60ebd101d0 Use blob viewers for snippets 2017-04-30 11:21:20 -05:00
Douwe Maan 87a3bd26fa Address feedback 2017-04-27 12:23:27 -05:00
Douwe Maan 964e7d206b Add specs 2017-04-27 12:23:26 -05:00
Douwe Maan a7fd95cd22 Render viewer error synchronously so that 'view the source' link will work 2017-04-27 12:23:26 -05:00
Douwe Maan 7cc4546bc9 Add specs 2017-04-27 12:23:26 -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
Eric Eastwood b42dc1a52b Linking to edit file directly 2017-04-06 16:36:38 +00:00
Bryce Johnson f564cbb21a Make file templates easy to use and discover 2017-04-03 17:54:40 +00:00
Jacopo 7b04b63eeb New directory from interface on existing branch 
The user can create a new directory on a different branch than the
source branch when the branch already exists.
 2017-03-21 11:51:53 +01:00
Alfredo Sumaran 08f7e49d29 Merge branch '19742-permalink-blame-button-line-number-hash-links' into 'master' 
Update permalink/blame buttons with line number fragment hash

Closes #19742

See merge request !9461
 2017-03-13 19:35:18 +00:00
Eric Eastwood c024248539 Update permalink/blame buttons with line number fragment hash 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742
 2017-03-13 11:58:59 -05:00
Jacopo e0fe2834eb New file from interface on existing branch 
Now you can create a new file and select a target_branch != source_branch.
If the file that you want to create already exists on the target branch an error message is shown
A glDropdown is used to select and create a new branch instead of a text field.
 2017-03-13 16:36:11 +01:00
Eric Eastwood 584b86da34 Add keyboard shortcut to move to file permalink 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/8082
 2017-02-06 16:57:52 -06:00
Douwe Maan 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