| Age | Commit message (Collapse) | Author |
|---|
|
|
|
# Conflicts:
# app/models/issue.rb
|
|
Fix deprecation warning when running webpack
See merge request !13656
|
|
|
|
# Conflicts:
# package.json
|
|
Fix broken Yarn dependencies
Closes #33886 and #34944
See merge request !13614
|
|
|
|
|
|
# Conflicts:
# package.json
# spec/support/features/reportable_note_shared_examples.rb
|
|
|
|
* master: (481 commits)
Make sure that we have author and committer
disable file upload button while uploading
Fix bar chart does not display label at hour 0
Fixed activity not loading on project homepage
Expose noteable_iid in Note
Fix fly-out width when it has long items
Add a test to show that threshold 40 would corrupt
Add changelog entry
Raise encoding confidence threshold to 50
Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/`
Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/`
Add Italian translations of Pipeline Schedules
Restrict InlineJavaScript for haml_lint to dev and test environment
Incorporate Gitaly's CommitService.FindCommit RPC
Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit
fix repo_edit_button_spec.js
fix test failures in repo_preview_spec.js
fix repo_loading_file_spec tests
Refactor Gitlab::Git::Commit to include a repository
use 100vh instead of flip flopping between the two - works on all suported browsers
...
|
|
* 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
...
|
|
* master: (177 commits)
Add changelog
Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
Make contextual sidebar collapsible
Fixed sidebar context header hover colors
Use correct `Environment`-class within `Gitlab` namespace
Remove gl.Activities from Commits page
Move `let` calls inside the `describe` block using them
Add `/assign me` alias support for assigning issuables to oneself
GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
Use `broken_storage` in the fs_shards_spec.
Eager load project creators for project dashboards
Memoize a user's personal projects count
Remove redundant query from User#recent_push
Improve checking if projects would be returned
Change spelling of gitlab-shell
Remove unused #tree-holder
Add custom linter for inline JavaScript to haml_lint
Rename user_can_admin? because it's more accurate
Synchronous zanata community contribution translation
Add Korean translation to i18n
...
|
|
Upgrade to webpack v3.4.0
Closes #33902
See merge request !12298
|
|
|
|
|
|
* master: (21 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix order of CI lint ace editor loading
Fix spec
Fix spec
Fix spec
Add changelog
fix
Add a spec for concurrent process
Add changelog
essential
add CHANGELOG.md for !13208
adjust user contribution calendar time formatting
fix rubocop violations 👮
fix mysql syntax for date INTERVAL arithmatic
add tests for proper timezone date grouping within ContributionsCalendar
adjust timezone for date grouping in contributions calendar
use timezone-aware Date.current instead of Date.today in ContributionsCalendar class
display system timezone underneath activity calendar
...
|
|
* master: (623 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix pipeline icon in contextual nav for projects
Since mysql is not a priority anymore, test it less
Fix order of CI lint ace editor loading
Add container registry and spam logs icons
Fix different Markdown styles
Backport to CE for:
Make new dropdown dividers full width
Fix spec
Fix spec
Fix spec
Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
Add changelog
Install yarn via apt in update guides
Use long curl options
fix
Add a spec for concurrent process
Remove monkey-patched Array.prototype.first() and last() methods
...
|
|
|
|
|
|
* master: (76 commits)
Add code review guidelines related to Build [CI skip].
Make time span dropdown style on cycle analytics page consistent
Add 204. Remove duplicated method.
Make sure we didn't commit conflicts
Fix bug in blob test
Always fetch branches before finding the merge base, otherwise we could find an outdated merge base
Fixes dropdown margin in sidebar
Docs add blog articles
Inline script cleanup globals and easy
Add option to use CommitLanguages RPC
CI fixes for gitaly-ruby
fix
Allow logged in users to read user list under public restriction
Small refactor in LegacyNamespace and moved back send_update_instructions
Rename ensure_dir_exist -> ensure_storage_path_exist
Added some extra TODOs for the Legacy Storage refactor
Make disk_path keyword argument and optional
Rename more path_with_namespace -> full_path or disk_path
Rename path_with_namespace -> disk_path when dealing with the filesystem
Rename many path_with_namespace -> full_path
...
|
|
|
|
|
|
Inline js removal projects other
See merge request !13075
|
|
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
|
|
|
|
into 'master'
Resolve "Transform user profile javascript into async bundle"
Closes #35224
See merge request !12929
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
chunk
|
|
|
|
|
|
monaco assets from public
|
|
|
|
|
|
Enable webpack code splitting
Closes #32989
See merge request !12032
|
|
module execution order issues
|
|
|
|
'28717-additional-metrics-review-branch'
Additional metrics dashboard
See merge request !11740
|
|
|
|
hot reloading for .vue files
Closes #33729
See merge request !12180
|
