Age | Commit message (Collapse) | Author |
|
* upstream/master: (238 commits)
Periodically clean up temporary upload files to recover storage space
Add a name field to the group edit form
Remove the User#is_admin? method
Fix specs
Enable RSpec/DescribeSymbol; update .rubocop_todo.yml
Update rubocop-rspec 1.12.0 -> 1.15.0
Rename displaying_blame to blame
Actually include WaitForAjax!
Don't show Copy contents button on Blame page
alfredo review changes
Give explicit height to SVG icons for Safari
Update MR title change icon
Put back usernames in activity and profile feed
Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run
Revert yarn.lock changes
add CHANGELOG.md entry for !10522
upgrade webpack-dev-server to fix issues with SockJS causing odd reload behavior in firefox
upgrade webpack to v2.3.3 to resolve sourcemap issues
Rever yarn.lock changes
Revert yarn.lock file changes
...
|
|
Enables user specification of group name vs. name inferred from group path.
Cause new group form to copy name from path
Adds some new page-specific javascript that copies entry from the
group path field to the group name field when the group name field
is initially empty.
Remove duplicate group name entry field on group edit form
This corrects the duplicated name entry field and tests that the
JavaScript does not update the group name field if the user
edits the group path. (Editing the group path is not recommended
in any case, but it is possible.)
Address eslint errors in group.js
Enable group name copy with dispatch and explore group creation
The dispatch and explore group creation forms require the group.js
asset, and their tests now require testing against poltergeist
Update workflow new group instruction
Update the gitlab basics group creation document
Add a change log entry
Remove unused variable for eslint
|
|
Protected Tags
Closes #18471
See merge request !10356
|
|
application readiness
|
|
* upstream/master: (590 commits)
Fixes failing spec
Fix icon name error
Rewrite system note helper
Change edit icon
Leave icon area blank if legacy note; remove diamond icon
Fix positioning of note icons
Fix newline errors
Add remaining system note icons
Add system notes icon helper; add icons
Fixed specs Updated JS that was causing the hints to appear & then disappear
Update tests
Fix broken spinach test
Reuse code
Improve shortcuts code
Adds ShortcutsDashboardNavigation to globals comment since its a global variable
Fix shortcut specs
Reorganize shortcut help menu
Change todos shortcut to shift
Change shortcuts
Switch global shortcuts to shift; reuse key styles from help menu
...
|
|
# Conflicts:
# spec/lib/gitlab/import_export/all_models.yml
|
|
|
|
'2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master'
Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation"
See merge request !10133
|
|
feature/multi-level-container-registry-images
* commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits)
Award emoji button smiley animation
Introduced empty/error UX states to environments monitoring.
Github import rake task
Remove individual modal width styles
Fix RuboCop for removing index
Link to docs site for file in doc/
Disable invalid service templates (again)
Show CI status as Favicon on Pipelines, Job and MR pages
STL file viewer
Wait for the PDF to be loaded before doing anything
remove unnecessary lease as cron job
Search for opened MRs - include reopened MRs
ProjectsFinder should handle more options
Clearly show who triggered the pipeline in email
Make it possible to preview pipeline success/failed emails
Add remove_concurrent_index to database helper
Add more tests for subgroups feature
Large features by the 1st, small ones by the 3rd
Ask people to create EE MRs on the 7th
fix project authorizations migration issue
...
|
|
twice a day 2
|
|
twice a day
|
|
|
|
|
|
Periodically mark projects that are stuck in importing as failed
Closes #17709
See merge request !10207
|
|
* master: (94 commits)
Merge branch 'open-redirect-fix-continue-to' into 'security'
Merge branch 'open-redirect-host-fix' into 'security'
Merge branch 'path-disclosure-proj-import-export' into 'security'
Merge branch '29364-private-projects-mr-fix'
Merge branch '30125-markdown-security'
Issue title realtime
Update CHANGELOG.md for 8.16.9
Update CHANGELOG.md for 8.17.5
Update CHANGELOG.md for 9.0.4
Add "search" optional param and docs for V4
Use PDFLab to render PDFs in GitLab
Separate Scala from Java in CI examples
Fix broken link
Reorganize CI examples, add more links
Refactor CI index page
Remove deprecated field from workhorse response
Use gitlab-workhorse 1.4.3
Document how ETag caching middleware handles query parameters
Make group skip validation in the frontend
Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware
...
|
|
|
|
# Conflicts:
# app/assets/javascripts/dispatcher.js
# app/assets/stylesheets/pages/projects.scss
|
|
|
|
|
|
Deal with Rails autoload instance variable resets
See merge request !10338
|
|
|
|
|
|
Adds import jid to projects
Refactor middleware to set custom expiration time via sidekiq options
Add completed_jids option to sidekiq status and a few other changes
|
|
Rails auto-load (a development feature) can end up resetting instance
variables on classes. This breaks Gitlab::GitalyClient, which uses
instance variables to keep global hashes to look up channels and
addresses. This change adds code that regenerates the hashes if they
suddenly become nil.
|
|
|
|
Sketch 43 files are technically a zip file, so the JavaScript opens the
zip file & locates a preview.png which is just a quick preview of the
last sketch page edited. After that is loaded it simply places the image
into the DOM
|
|
|
|
|
|
'master'
Adds git terminal prompt env var to application rb
Closes #24187
See merge request !10372
|
|
* master: (57 commits)
Ensure we generate unique usernames otherwise validations fail
Fix a Knapsack issue that would load support/capybara.rb before support/env.rb
Ensure users have a short username otherwise a click event is triggered ...
Enable the `bullet_logger` setting; enable `raise` in test environment
Fix Rubocop offenses
Set the right timeout for Gitlab::Shell#fetch_remote
Refactoring Projects::ImportService
Move methods that are not related to mirroring to the repository model
Fix GitHub pull request formatter spec
Rename skip_metrics to imported on the importable concern
Add CHANGELOG
Remove unused include from RepositoryImportWorker
Skip MR metrics when importing projects from GitHub
Fetch GitHub project as a mirror to get all refs at once
Make file templates easy to use and discover
Ensure user has a unique username otherwise `user10` would match `user1`
Ensure the AbuseReport fixtures create unique reported users
Don't use FFaker in factories, use sequences instead
Fix brittle specs
Fix the AbuseReport seeder
...
Conflicts:
db/schema.rb
|
|
|
|
|
|
Closes gitaly#166
|
|
* master: (230 commits)
Fix N+1 query in loading pipelines in merge requests
Fix Spinach and Capybara dependencies
Prevent users from disconnecting gitlab account from CAS
30276 Move issue, mr, todos next to profile dropdown in top nav
Refactor SearchController#show
Properly eagerly-load the Capybara server for JS feature specs only
Updating documentation to include a missing step in the update procedure
Eager-load the Capybara server to prevent timeouts
Increase Capybara's timeout
Add metrics button to Environment Overview page
Fix link to Jira service documentation
Handle parsing OpenBSD ps output properly to display sidekiq infos on ...
Eliminate unnecessary queries that add ~500 ms of load time for a large issue
20914 Limits line length for project home page
Allow users to import GitHub projects to subgroups
Update dpl CI example
Fix the docs:check:links job
Don't clean up the gitlab-test-fork_bare repo
Make GitLab use Gitaly for commit_is_ancestor
Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery
...
|
|
If a subdirectory contains spaces, GitLab would be unable to generate
the route in the sidebar, resulting in an Error 500.
Closes #30357
|
|
Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell
|
|
|
|
|
|
Add metadata for system notes
See merge request !9964
|
|
Use full path for moving directories when changing namespace path
See merge request !2078
|
|
One Gitaly connection per storage shard
See merge request !10150
|
|
|
|
|
|
|
|
iPython notebook viewer
See merge request !10017
|
|
* upstream/master: (43 commits)
Update CHANGELOG.md for 9.0.1
Support wider range of monitored environments with Prometheus
Add changelog entry
Don't include branch name in Knapsack report file
Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost settings
Fixed issue boards sidebar alignment
Fixed alignment of tooltip on card assignee
Stops triggering board sidebar when clicking avatar
Get rid of a third N+1 query problem
Get rid of second N+1 query problem
Get rid of a first N+1 query problem
Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes
Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
Use `:empty_project` where possible in service specs
Adds entry about kebab case props in documentation
Fix sub-nav highlighting for `Environments` and `Jobs` pages
spread out webpack bundles per-line to reduce conflicts in EE
Improve UX guide on tooltips
Correct example value variable name.
If wget fails, remove the empty file created
...
|
|
Fix environment folder route when special chars present
Closes #29922
See merge request !10250
|
|
|
|
|
|
* upstream/master: (127 commits)
Fixed up issue boards JS specs
Implement new service for creating user
Add Changelog entry for pipeline retry fix
Do not retry jobs multiple times when retrying a pipeline
Update sentry-raven 2.0.2 -> 2.4.0
Update webmock 1.21.0 -> 1.24.6
Update spring 1.7.2 -> 2.0.1
Update simplecov 0.12.0 -> 0.14.1
Update pry-rails 0.3.4 -> 0.3.5
Update pry-byebug 3.4.1 -> 3.4.2
Update flay 2.6.1 -> 2.8.1
Optimize labels finder query
Remove Tags filter from Projects Explore dropdown
Update capybara-screenshot 1.0.11 -> 1.0.14
Update bullet 5.2.0 -> 5.5.1
Update brakeman 3.4.1 -> 3.6.1
Remove web-console gem
Update better_errors 1.0.1 -> 2.1.1
Display flash message to unauthenticated user when creating new issue
Activate group name toggle based on horizontal space
...
|