Age | Commit message (Collapse) | Author |
|
* master: (84 commits)
Migrate Gitlab::Git::Wiki#page to Gitaly
Load participants async
Normalize LDAP DN when looking up identity
Improve the maintenance policy page
add changelog
fix spec failure
Allow promoting project milestones to group milestones
fix specs
Be able to bundle gems with newer rubies
Upgrade Ruby to 2.3.5
fixed up upload feature after master merge
fix missing issue assignees
Migrate Gitlab::Git::Wiki#delete_page to Gitaly
Enable eslint
Make `#hashed_storage?` require feature argument
Adds callback function to inital cluster request
Fix example typo.
Upload files through the multi-file editor
get branch name from the DOM
Resolve "Convert autosize.js library to be a Yarn managed library"
...
|
|
Bump carrierwave to 1.2.1
Closes #39580
See merge request gitlab-org/gitlab-ce!15072
|
|
Closes gitaly#673
|
|
|
|
|
|
* master: (96 commits)
Fetch the merged branches at once
Merging EE doc into CE
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
Cache commits on the repository model
Remove groups_select from global namespace & simplifies the code
Change default disabled merge request widget message to "Merge is not allowed yet"
Semi-linear history merge is now available in CE.
Remove repetitive karma spec
Improve spec to check hidden component
Rename to shouldShowUsername
Add KubernetesService#default_namespace tests
Revert "Merge branch '36670-remove-edit-form' into 'master'"
Fix bitbucket login
Remove duped tests
Add path attribute to WikiFile class
Make local_branches OPT_OUT
Clarify the language around External Group membership with SAML SSO to clarify that this will NOT add users to GitLab Groups.
Added ssh fingerprint, gitlab ci and pages information in an instance configuration page
Fix the incorrect value being used to set GL_USERNAME on hooks
Resolve "Remove overzealous tooltips in projects page tabs"
...
|
|
We also unify conversions from and to `Gitaly::User`s in the
`Gitlab::Git::User` class.
|
|
* master: (297 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
|
|
This merge requests update the gem to v0.2.0 which contains the fix:
https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c
Closes #39126
|
|
into 'master'
Update Prometheus gem to fix problems with other Processes overwriting current metrics file
Closes #36714
See merge request gitlab-org/gitlab-ce!14827
|
|
|
|
Closes gitaly#638
|
|
|
|
* master: (104 commits)
Update licenses
fix a wrong method call in the refactor
fix a whitespace
fix for discussion
Update templates via:
Update doc accordingly to:
Cache issuable template names
Fix the format of rugged alternate directory list
Match full file path in FileDetector
Fixes from CSS refactor
Resolve "Prometheus service page shows error"
Explicit state integration deletion
Move all API authentication code to APIGuard
Shorten example translation for inclusive language
[ci-skip] add changelog
fix the merger override to remove source branch
add spec
Removed d3.js from the users and graphs bundle
Cleanup data-page attribute after each Karma test
Update template description wording
...
|
|
|
|
|
|
Upgrade doorkeeper-openid_connect
See merge request gitlab-org/gitlab-ce!14372
|
|
* master: (21 commits)
Fix bottom spacing for dropdowns that open upwards
Fix linting errors in sprintf
regression with product labels
Hide Gollum inside Gitlab::Git::Wiki
Restore User.from_gitaly
Added skeleton loading paradigm to UX guide
Remove those tests as they're not needed anymore
Resolve "Precompiled assets with digest strings are ignored in CI"
Make the `QA:Page::Project::Show` driver less brittle
Change index on ci_builds to optimize Jobs Controller
Add basic sprintf implementation to JavaScript
Expose GitLab features to the CI runner
Hide CI section markers from job trace
Freeze the constant array
Just allow the scheme we want!
Adapt to the latest addressable behaviour
Strip before passing to addressable, otherwise it's invalid
Make sure we didn't blow up if URI is invalid
Only update gems we need
ok
...
|
|
|
|
gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6
* upstream/master: (186 commits)
Resolve "Precompiled assets with digest strings are ignored in CI"
Fix navigation dropdown close animation on mobile screens
Add (partial) index on Labels.template
Add grpc.log for Gitaly
Fix gitaly-proto version in Gemfile.lock
refactor issues_controller_spec `update` action
Remove edit action for issues
Add documentation to summarise project archiving
Fix for Gitaly nil encoding issue
Fix broken certificate-authority-data with kubectl >= 1.8.0
Improve performance of filtering notes in NotesController
Bump gitaly-proto version to v0.39.0
Fix specs for project creation and update services
Add CHANGELOG
Doesn't check if path exists on disk when renaming a hashed project
[ci skip] Fix archive spec descrptions
Only copy old/new code when selecting left/right side of parallel diff
Fix gitlab-rake gitlab:import:repos task
Send extra Gitaly params for `send_git_archive` if needed
Update GitLab Pages to v0.6.0
...
|
|
|
|
|
|
|
|
Closes gitaly#562
|
|
gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6
* upstream/master: (130 commits)
Handle error when fetching ref for MR with deleted source branch
refactor emails service
fix update service
refactor users update service
refactor keys controller
refactor some controllers to make them EE friendly
fix specs
fix users update service
update initializers
refactor services to match EE signature
Change recommended MySQL version to 5.6
Clarify artifact download via the API only accepts branch or tag name for ref
Clean merge_jid whenever necessary on the merge process
Rolling back change to n+1 detection
Breadcrumbs receives padding when double lined
karma spec fixes
Add EEP to headings
Added some Gitaly docs to `docs/development`
Check orientation of profile image
Fixed missing namespaces on navigation translations
...
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
This recent update fixes an issue in grape_logging where the status
code would be "fail" for any non-20x responses. For more details, see:
https://github.com/aserafin/grape_logging/issues/29
|
|
Add JSON logger in `log/api_json.log` for Grape API endpoints
Closes #36189
See merge request !14102
|
|
Update the omniauth-google-oauth2 gem to 0.5.2
Closes #37411
See merge request !14105
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Implement fix for n+1 issue on `flatten_tree` helper
Closes gitaly#530
See merge request !14097
|
|
Update capybara 2.6.2 -> 2.15.1
See merge request !13976
|
|
Closes #36189
|
|
|
|
Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxies
Closes gitlab-ee#3125
See merge request !13617
|
|
|
|
|
|
Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP
proxy were confused via the `http_proxy` environment variables:
https://github.com/sumoheavy/jira-ruby/issues/250
Closes gitlab-org/gitlab-ee#3125
|
|
Changelog: https://git.io/v5403
|
|
|
|
|
|
|