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
110,751 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

58 Commits

Author SHA1 Message Date
GitLab Bot f3c61892ec Add latest changes from gitlab-org/gitlab@master 2023-06-02 18:09:02 +00:00
GitLab Bot e10ea43772 Add latest changes from gitlab-org/gitlab@master 2023-03-23 12:11:54 +00:00
GitLab Bot fc0afaf7da Add latest changes from gitlab-org/gitlab@master 2023-01-11 12:07:18 +00:00
GitLab Bot 9dc655286f Add latest changes from gitlab-org/gitlab@master 2022-12-05 21:08:33 +00:00
GitLab Bot eb3a23aaaa Add latest changes from gitlab-org/gitlab@master 2022-09-28 12:07:50 +00:00
GitLab Bot bc835172ed Add latest changes from gitlab-org/gitlab@master 2022-02-04 00:13:53 +00:00
GitLab Bot 7b2dc9fe33 Add latest changes from gitlab-org/gitlab@master 2022-01-12 18:13:20 +00:00
GitLab Bot 6a5b78ac69 Add latest changes from gitlab-org/gitlab@master 2021-12-07 03:12:22 +00:00
GitLab Bot fcfd395a4b Add latest changes from gitlab-org/gitlab@master 2021-05-28 15:10:28 +00:00
GitLab Bot a880341a7b Add latest changes from gitlab-org/gitlab@master 2021-05-25 18:10:42 +00:00
GitLab Bot 10130901f1 Add latest changes from gitlab-org/gitlab@master 2021-04-15 15:09:11 +00:00
GitLab Bot 418a39f6c2 Add latest changes from gitlab-org/gitlab@master 2021-04-07 00:09:26 +00:00
GitLab Bot a57cec4bb8 Add latest changes from gitlab-org/gitlab@master 2021-02-16 09:09:36 +00:00
GitLab Bot 33827e3a53 Add latest changes from gitlab-org/gitlab@master 2020-11-23 15:09:37 +00:00
GitLab Bot 9cdba33385 Add latest changes from gitlab-org/gitlab@master 2020-10-09 12:09:07 +00:00
GitLab Bot 1086ac5177 Add latest changes from gitlab-org/gitlab@master 2020-09-22 09:09:43 +00:00
GitLab Bot 8b0ef13236 Add latest changes from gitlab-org/gitlab@master 2020-06-03 18:08:28 +00:00
GitLab Bot 0ff031c7f4 Add latest changes from gitlab-org/gitlab@master 2019-10-15 21:06:25 +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
Oswaldo Ferreira 8f59ea33e7 Extract EE specific tests for protected branches/tags 
We have the spec files containing EE specific code for
spec/features/protected_branches_spec.rb and
spec/features/protected_tags_spec.rb.
This commit deletes / extracts the CE part of it.
 2019-04-25 13:06:06 -03:00
Sam Bigelow c607b35824 Use 'delete' instead of 'remove' for source branch 
This is to match `git branch -D <branchname>`
 2019-01-22 12:57:01 -05: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
Luke Bennett 4878ef2fa7 CE port gitlab-ee!6112 2018-06-27 11:41:16 +00:00
Mark Chao cfcc7043fe Rename “Developers + Masters” 2018-06-06 20:57:15 +09:00
Jose 4d4bea5410
fix protected_branches_spec.rb 2018-05-23 16:28:08 -05:00
Jan c2823a4bda Resolve "Protected branches count is wrong when a wildcard includes several protected branches" 2018-04-04 10:37:44 +00:00
Jose Ivan Vargas 3ac444b8da Fix trigger elements and element is not clickable at this position 2017-10-11 16:54:05 -05:00
Jose Ivan Vargas 26b66e58ca backport protected_branches_spec improvements from EE 2017-10-06 17:04:45 -05:00
Jose Ivan Vargas 10dfa99342 fix protected_branch spec describe block 2017-10-05 16:41:57 -05:00
Tim Zallmann 5725e347eb Merge branch '32163-protected-branch-form-should-have-sane-defaults-for-dropdowns' into 'master' 
Resolve "Protected branch form should have sane defaults for dropdowns"

Closes #32163

See merge request gitlab-org/gitlab-ce!14278
 2017-10-05 13:52:49 +00:00
Rémy Coutable 8dd750e4f7 Fix the default branches sorting to actually be 'Last updated' 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-09-25 19:06:51 +02:00
Jose Ivan Vargas f68b3aaaad Added defaults for the protected branches dropdowns for the repository settings 2017-09-20 14:11:45 -05: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
Mike Greiling 4b1d956e13 Resolve "Simplified Repository Settings page" 2017-06-07 08:11:44 +00:00
Alejandro Rodríguez f3cbb0a450 Clean import of shared examples for protected branches/tags 2017-05-16 12:16:31 -04:00
Robert Speicher 6c94483890 Change from .click -> .trigger('click') to make spec pass 2017-04-28 17:45:47 -05:00
Rémy Coutable 3855751d02
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax' 
See merge request !10567

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-24 18:06:47 +02: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
Robert Speicher aef345024f Use `:empty_project` where possible in top-level feature specs 2017-04-20 17:30:55 -04:00
Timothy Andrew 255dbb3228 Move protected branches access control spec into a shared example. 
1. EE access control specs are significantly different, so this is a way
   to reduce potential merge conflicts. EE and CE specs go in separate files.
 2016-08-20 00:24:12 +05:30
Timothy Andrew 8c101fc313 Backport EE assertions in protected branch related specs. 
- Use assertions in the vein of `merge_access_levels.map(&:access_level)`
  instead of `merge_access_levels.first.access_level`
 2016-08-16 22:19:49 +05:30
Timothy Andrew 4c28d62672 Don't select an access level if already selected. 
1. This is in regard to the protected branches feature spec.

2. For example, if "Masters" is already selected, don't re-select
   "Masters" during the spec.

3. This is due to a bug in the frontend implementation, where selecting
   an already-selected access level _deselects_ it, which is something
   we don't need. I'll create a separate issue for this.

4. This hasn't turned up before, because we were manually creating
   missing access levels prior to e805a64. Now, we just use nested
   attributes, and missing access levels fail validation.
 2016-08-16 11:14:45 +05:30
Timothy Andrew e805a64700 Backport changes from gitlab-org/gitlab-ee!581 to CE. 
!581 has a lot of changes that would cause merge conflicts if not
properly backported to CE. This commit/MR serves as a better
foundation for gitlab-org/gitlab-ee!581.

= Changes =

1. Move from `has_one {merge,push}_access_level` to `has_many`, with the
   `length` of the association limited to `1`. This is _effectively_ a
   `has_one` association, but should cause less conflicts with EE, which
   is set to `has_many`. This has a number of related changes in the
   views, specs, and factories.

2. Make `gon` variable loading more consistent (with EE!581) in the
   `ProtectedBranchesController`. Also use `::` to prefix the
   `ProtectedBranches` services, because this is required in EE.

3. Extract a `ProtectedBranchAccess` concern from the two access level
   models. This concern only has a single `humanize` method here, but
   will have more methods in EE.

4. Add `form_errors` to the protected branches creation form. This is
   not strictly required for EE compatibility, but was an oversight
   nonetheless.
 2016-08-16 11:05:14 +05:30
Alfredo Sumaran cd086eba79 Wrap param with parens for consistency 2016-08-05 17:19:01 -05:00
Alfredo Sumaran c2912b46f8 Add custom css class to each dropdown to fix failing spec 2016-08-05 17:19:01 -05:00