Age | Commit message (Collapse) | Author |
|
Enable Layout/TrailingWhitespace cop and auto-correct offenses
See merge request !13573
|
|
|
|
|
|
|
|
* master: (86 commits)
Show all labels
33874 confidential issue redesign
Exclude merge_jid on Import/Export attribute configuration
Resolve "User dropdown in filtered search does not load avatar on `master`"
Re-add column locked_at on migration rollback
Group-level new issue & MR using previously selected project
[EE Backport] Update log audit event in omniauth_callbacks_controller.rb
more eagerly bail when the state is prevented
Move locked_at removal to post-deployment migration
Add class to other sidebars
Improve mobile sidebar
reduce iterations by keeping a count of remaining enablers
Store & use ConvDev percentages returned by Version app
Store MergeWorker JID on merge request, and clean up stuck merges
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
DRY up caching in AbstractReferenceFilter
Update CHANGELOG
Add CHANGELOG entry
Fix html structure Removes test for removed behavior
Port form back to use form_tag
...
|
|
|
|
|
|
into 'master'
Pending delete projects should now show in deploy keys
Closes #35338
See merge request !13088
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
|
|
* upstream/master: (34 commits)
Revert "Merge branch 'karma-headless-chrome' into 'master'"
Make small pipeline schedules UI enhancements.
Remove js classes from vue component that are not needed in vue component
Update tests and application
Adds "Pipeline" to job's sidebar
Change border color of job's scroll controllers to $border-color
Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone'
Added Tectonic to the page.
Always check read_issue permissions when loading issue
Handle legacy jobs without name
Do not expose internal artifacts hash in build entity
Use wait_for_requests instead of sleep 0.3
Limit wiki container width
Fix migrations testing support RSpec hooks order
Rename BuildEntity to JobEntity
Fix support for external_url for commit statuses
Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them
add CHANGELOG.md entry for !12036
remove phantomjs-specific test hacks
update karma job to use chrome build image created by gitlab-build-images!41
...
|
|
Allow to access statuses for external CI services
Closes #30714, #29369, and #15220
See merge request !11176
|
|
* upstream/master: (460 commits)
Center dropdown for pipeline's mini graph
Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions
Fix filename method of GitlabUploader to return always real filename
Ignore CVE-2017-5029 in Nokogiri
Refactor atom builder by using xml.atom layout
Let PhantomJS load local images
Add a changelog entry
Only add a description change note when no tasks are updated
Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
Use gitaly 0.11.2
Add the ability to perform background migrations
Always render warnings icon in orange
Fix a few translation for zh_TW
Improve Job detail view to make it refreshed in real-time instead of reloading
Attempts to run RSpec tests twice (1 retry)
ignore name validation on importing
Only show hover state on links and buttons
Use vue files for navigation tabs and buttons
doc: add example of scheduler when
Add test for u2f helper and changelog entry
...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Implement ability to update deploy keys
Closes #3191
See merge request !10383
|
|
Avoid repeated queries for pipeline builds on merge requests
See merge request !11888
|
|
|
|
|
|
in the tests
|
|
* master: (524 commits)
Improve user experience around slash commands in instant comments
Fix LFS timeouts when trying to save large files
retryable? is now available for CommitStatus
Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
Fix test failures
Add slugify project path to CI enviroment variables
Fixed typo: craeted -> created
32118 Make New environment empty state btn lowercase
Expose import_status in Projects API
32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
Fix test failures
Allow manual bypass of auto_sign_in_with_provider
Fix keys seed
Allow users to be hard-deleted from the API
fixup some classnames and media queries
Enable the Style/PreferredHashMethods cop
Lint our factories creation in addition to their build
Don’t schedule workers from inside transactions
Allow scheduling from after_commit hooks
Forbid Sidekiq scheduling in transactions
...
Conflicts:
app/serializers/pipeline_entity.rb
db/schema.rb
spec/factories/ci/stages.rb
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/services/ci/create_pipeline_service_spec.rb
spec/spec_helper.rb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Also add minor changed needed to pass review
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
|
|
# Conflicts:
# db/schema.rb
|
|
|