Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-19Merge branch '45507-fix-repository-archive-url' into 'master'Douwe Maan
Fix specifying a non-default ref when requesting an archive using the legacy URL Closes #45507 See merge request gitlab-org/gitlab-ce!18468
2018-04-19Fix specifying a non-default ref when requesting an archive using the legacy URLNick Thomas
2018-04-19Resolve "Show `failure_reason` in jobs view content section"Mayra Cabrera
2018-04-18Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López
2018-04-18Merge branch 'blackst0ne-rails5-add-safe-params-helper' into 'master'Sean McGivern
[Rails5] Add `safe_params` helper See merge request gitlab-org/gitlab-ce!18241
2018-04-18Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉
2018-04-16Merge branch '8088_embedded_snippets_support' into 'master'Grzegorz Bizon
Embedded Snippets Support Closes #8088 See merge request gitlab-org/gitlab-ce!15695
2018-04-13Don't reset application settings oauth providers by mistakeDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-04-13Don't reset application settings import sourcesDmitriy Zaporozhets
If form does not have import sources checkboxes we should not reset import sources to empty. This fixes issue when import sources got reset after user modifies unrelated settings section like GitLab pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-04-12Merge branch 'dm-archived-read-only' into 'master'Robert Speicher
Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
2018-04-12Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan
Optimise rendering of Markdown documents that belong to different projects See merge request gitlab-org/gitlab-ce!18157
2018-04-11Resolve "tree/master shows incorrect CI build status"Lin Jen-Shin
2018-04-11Support Markdown rendering using multiple projectsYorick Peterse
This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible.
2018-04-11Correct permissions for creating merge requests from issuesBob Van Landuyt
This could only be possible for users that can create merge requests within a project. So they need to be a allowed to create a branch and create a merge request.
2018-04-11Share collaboration check between view and presenterBob Van Landuyt
2018-04-11Rename `create_merge_request` permissionsBob Van Landuyt
So we can distinguish between the permissions on the source and the target project. - `create_merge_request_from` indicates a user can create a merge request with the project as a source_project - `create_merge_request_in` indicates a user can create a merge request with the project as a target_project
2018-04-11Prevent new merge requests for archived projectsBob Van Landuyt
This prevents creating merge requests targeting archived projects. This could happen when a project was already forked, but then the source was archived.
2018-04-11[Rails5] Fix admin/application_settings_controllerblackst0ne
The `RAILS5=1 rspec spec/controllers/admin/application_settings_controller_spec.rb` command throws the error: Failures: 1) Admin::ApplicationSettingsController PUT #update falls back to defaults when settings are omitted Failure/Error: import_sources = params[:application_setting][:import_sources] NoMethodError: undefined method `[]' for nil:NilClass # ./app/controllers/admin/application_settings_controller.rb:62:in `application_setting_params' This commit fixes it.
2018-04-09Merge branch 'sh-handle-legacy-archive-requests' into 'master'Douwe Maan
Handle legacy repository archive requests with no ref given Closes #45154 See merge request gitlab-org/gitlab-ce!18246
2018-04-08Handle legacy repository archive requests with no ref givenStan Hu
The legacy endpoint requires no reference and defaults to the root ref. Closes #45154
2018-04-08Projects and groups badges settings UIFrancisco Javier López
2018-04-08[Rails5] Add `safe_params` helperblackst0ne
Rails 5.0 requires to explicitly permit attributes when building a URL using current `params` object. The `safe_params` helper allows developers to just call `safe_params.merge(...)` instead of manually adding `permit` to every call. https://github.com/rails/rails/pull/20868
2018-04-07Handle limit for datetime attributes on MySQLMayra Cabrera
The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController
2018-04-07Removes deploy tokens presenterMayra Cabrera
2018-04-07Addresses database commentsMayra Cabrera
- Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes
2018-04-07Fixes broken schema and minor changesMayra Cabrera
2018-04-07Get rid of Redis when dealing with deploy tokensKamil Trzciński
We use controller actions to pass a newly created token and errors
2018-04-07Include ProjectDeployTokensMayra Cabrera
Also: - Changes scopes from serializer to use boolean columns - Fixes broken specs
2018-04-07Addreses backend review suggestionsMayra Cabrera
- Remove extra method for authorize_admin_project - Ensure project presence - Rename 'read_repo' to 'read_repository' to be more verbose
2018-04-07Removes logic from Jwt and handle different scenarios on Gitlab::AuthMayra Cabrera
- When using 'read_repo' password and project are sent, so we used both of them to fetch for the token - When using 'read_registry' only the password is sent, so we only use that for fetching the token
2018-04-07Implement read_registry for DeployTokensMayra Cabrera
2018-04-07Address UX reviewMayra Cabrera
- Keep 'Deploy Section' open upon save, otherwise the token might get lost - When an error appears, display the error inside the form and also keep the Deploy Section open - Changue copy of revoke modal
2018-04-07Create barebones for DeploytokenMayra Cabrera
Includes: - Model, factories, create service and controller actions - As usual, includes specs for everything - Builds UI (copy from PAT) - Add revoke action Closes #31591
2018-04-06Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan
Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225
2018-04-06Merge branch ↵Douwe Maan
'blackst0ne-rails5-update-skip-before-action-in-authenticates-with-two-factor-concern' into 'master' [Rails5] Add `raise: false` to skip_before_action in authenticates_with_two_factor.rb See merge request gitlab-org/gitlab-ce!18221
2018-04-06Merge branch '43246-checkfilter' into 'master'Sean McGivern
Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961
2018-04-06Add new repository archive routeJames Ramsay
Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add `<project>/-/archive/<ref>/<filename>.<format>` route using the `-` separator to prevent namespace collisions. If the filename is `<project>-<ref>` or the ref is a sha, the sha will be omitted, otherwise the default filename will be used. - deprecate previous archive route `repository/<ref>/archive`
2018-04-06[Rails5] Add `raise: false` to skip_before_action in ↵blackst0ne
authenticates_with_two_factor.rb Rails 5.0 raises `ArgumentErrror` if an unrecognised callback is skipped. https://github.com/rails/rails/commit/8b88df94ebda2e829782f514ff51caeaf5e694dd This commit adds `raise: false` to the filter.
2018-04-06Add confirmation modal to "Change username"Shah El-Rahman
2018-04-06Merge branch 'issue_44270' into 'master'Sean McGivern
Show issues of subgroups in group-level issue board Closes #44270 See merge request gitlab-org/gitlab-ce!18187
2018-04-06Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera
2018-04-05Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon
Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160
2018-04-05Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński
Resolve "Allow HTTPS cloning by Runners if it is disabled for users" Closes #44389 See merge request gitlab-org/gitlab-ce!18021
2018-04-05Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński
Fix `JobsController#raw` endpoint can not read traces in database Closes #44665 See merge request gitlab-org/gitlab-ce!18101
2018-04-05Show issues of subgroups in group-level issue boardFelipe Artur
2018-04-05Merge branch 'osw-44295-adjust-authorization-for-discussions-show' into 'master'Sean McGivern
Adjust 404's for LegacyDiffNote discussion rendering Closes #44295 See merge request gitlab-org/gitlab-ce!18201
2018-04-05Add change logShinya Maeda
2018-04-05Adjust 404's for LegacyDiffNote discussion renderingOswaldo Ferreira
2018-04-05Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ↵Kamil Trzciński
'master' Use chronic duration attribute for project build timeout See merge request gitlab-org/gitlab-ce!17386
2018-04-05Add `direct_upload` setting for artifactsKamil Trzciński