| Age | Commit message (Collapse) | Author |
|---|
|
Resolve ""New branch" and "New tag" actions are pointless on an empty repository"
Closes #39988
See merge request gitlab-org/gitlab-ce!16332
|
|
|
|
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.
This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)
Closes #40301
|
|
|
|
Replace factory_girl_rails with factory_bot_rails
See merge request gitlab-org/gitlab-ce!15919
|
|
I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands:
```
grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|"
grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|"
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- Improves CSS files by reusing existing code
- Changes logic in views to avoid future problems in translations
|
|
- Display the default branch (if the limit is not exceeded)
- Requires '...' to be clicked before showing the rest of the branches and/or tags
- Fixes haml lints
|
|
- Create a partial for limit exceeded message
- Modifies specs to adjust new scenarios
|
|
|
|
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.
To fix this:
1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
`Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
like that in several places.
3. Change the initializers to use that new form.
|
|
|
|
'34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master'
Resolve "Make edit comment button always available outside of dropdown"
Closes #34527
See merge request !12931
|
|
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
|
stubbing them
|
|
|
|
|
|
|
|
Consistent diff and blob size limit names
See merge request !11776
|
|
|
|
* upstream/master: (31 commits)
Remove 'no changes' entries from changelog
Check if OLD is set when migrating issue assignees
Fix data migration from trigger schedules
Replace EFS section in AWS guide
Add warning about AWS EFS and performance
Consolidate opening text from about.gitlab.com and add active/passive note
Fix invalid object reference in ee_compat_check script
Fix Ordered Task List Items
Add auxiliary viewer for README
Update fe_guide testing.md
Add auxiliary blob viewer for CHANGELOG
Add spec for last commit info when browsing repository files
Show last commit for current tree on tree page
Use same last commit widget on project homepage and tree view
Fix unassigned checkmark
Add missing changelog for iPython notebook rendering feature
Convert fa-history to svg; tweak alignment
Get rid of pluck in app/services/members/authorized_destroy_service.rb
Removes duplicate environment variable in documentation
Fixed spacing issues in issue sidebar
...
|
|
|
|
|
|
Rename other URL generators
admin_builds_path -> admin_jobs_path
Fix tests and more renaming
Fix more tests
Also change build_id to job_id in the controller
|
|
max_size
|
|
|
|
|
|
Retried in database
Closes #25737
See merge request !11115
|
|
Security patches -> `master`
See merge request !11230
|
|
New Hamlit XSS fix, does not include extraneous changes
See merge request !2095
|
|
|
