| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
add-ci_variables-environment_scope
* upstream/master: (192 commits)
Minor edits
Job details won't scroll horizontally to show long lines
Bring back branches badge to main project page
Inserts exact matches of username, email and name to the top of the user search list
Limit OpenGraph image size to 64x64
Improve changelog
Split up MergeRequestsController
Add parent_id back to the tests
Make changelog more descriptive
Update README.md to reflect where "Secret variables" are located
Improve tests text
Rename members_count to members_count_with_descendants and expose only to group admins
Fix a bug where an invalid sort param value was passed to Gitaly
Drop default ORDER scope when calling a find method on a Sortable model
Add tests for project import state transition: [:started] => [:finished]
Add CHANGELOG
Perform housekeeping only when an import of a fresh project is completed
Strip trailing whitespace in relative submodule URL
Adjust projects spec on namespace fields
Add "members_count" and "parent_id" data on namespaces API
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Rename all forbidden paths again
Closes #32625
See merge request !11713
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
add-ci_variables-environment_scope
* upstream/master: (226 commits)
Polish sidebar toggle
Add changelog entry
Fix optional args for POST :id/variables
Update CHANGELOG.md for 9.3.1
Bump bootsnap to 1.1.1
Add explicit message when no runners on admin
Fix endpoint not being update correctly
Remove unused Gitlab::Git::Commit#to_diff argument
Drop GFM support for the title of Milestone/MergeRequest in template
Handle Promise rejections in mr_widget_pipeline_spec.js
Handle missing pipeline in merge request widget
Store merge request ref_fetched status in the database
Tag a spec as :nested_groups since it fails on MySQL
Bump premailer-rails gem to 1.9.7 and its dependencies to prevent network retrieval of assets
Truncate long job names in environment view; wrap author to next line
Replaces 'dashboard/merge_requests' spinach with rspec
Update GITLAB_SHELL_VERSION to 5.0.6
Fix click not being able to find the current element to use trigger('click') instead
make accepting mrs more prominent
Remove last references to job for pipeline charts
...
|
| |\ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Store merge request ref_fetched status in the database
Closes #34052
See merge request !12424
|
| | |
| | |
| | |
| | | |
Closes #34052
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* master: (56 commits)
File view buttons
Don't reset the session when the example failed, because we need capybara-screenshot to have access to it
Resolve "MR comment + system note highlight don't have the same width"
Add feature spec for dashboard state filter tabs
Wording of Mysql support.
a new feature checklist and more elaborate documentation requirements
Filter archived project in API v3 only if param present
Revert to using links instead of buttons in Issuable Index tabs.
Do not run the codeclimate job on docs-only changes
Only show gray footer space if environment actions exist
Migrate Gitlab::Git::Blob.find to Gitaly
Backport filtered search lazy token consistent state fix
Add a comment explaining how the branch clean up happens
Fix Github::Representation::PullRequest#source_branch_exists?
Add CHANGELOG
Fix GitHub importer performance on branch existence check
Rebuild the dynamic path before validating it
Rename stage ref migration specs to match a class name
Enable Style/DotPosition Rubocop :cop:
Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
...
Conflicts:
db/post_migrate/20170526185921_migrate_build_stage_reference.rb
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12363#note_33449374
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
foreign key, I mean.
|
| | | |
|
| |/
|/|
| |
| |
| |
| | |
This is merely to make CE and EE more compatible.
See the EE merge request at:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Improve build stages reference migration
Closes #33866
See merge request !12337
|
| |\ \
| | | |
| | | |
| | | | |
# Conflicts:
# db/schema.rb
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Disable statement timeout in CI pipelines migration
See merge request !12268
|
| |/ / / |
|
| |/ /
|/| | |
|
|\ \ \
| |_|/
|/| |
| | |
| | | |
Add index for head pipeline
See merge request !12273
|
| |/ |
|
|/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds an ID-less table containing one row per file, per merge request
diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
currently, with the advantage that we can easily query the attributes of this
new table.
It does not migrate existing data, so we have fallback code when the legacy
st_diffs column is present instead. For a merge request diff to be valid, it
should have at most one of:
* Rows in this new table, with the correct merge_request_diff_id.
* A non-NULL st_diffs column.
It may have neither, if the diff is empty.
|
| |
|
|
|
|
|
|
| |
Create a post-deployment migration to update all existing notification settings
with at least one custom level enabled to the new format. Also handle the same
conversion when updating settings, to catch any stragglers.
|
|
|
|
|
|
| |
Add columns for each custom notification level, defaulting to null. Read from
those columns if non-null, otherwise fall back to the serialized column. Writing
will write to the new column if `events` isn't manually set.
|
| |
|
|
|
|
| |
'timestamps_with_timezone'
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
|
| |
|
|\
| |
| |
| |
| | |
Migrate pipeline stages in the database
See merge request !11714
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|