- 22 Jun, 2017 8 commits
-
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
-
Rubén Dávila Santos authored
Normalise license MD5 values See merge request !2205
-
Valery Sizov authored
-
Valery Sizov authored
-
Stan Hu authored
Fix remaining DotPosition cops
👮 Closes #2710 See merge request !2211 -
Eric Eastwood authored
Introduced in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2201
-
- 21 Jun, 2017 32 commits
-
-
Stan Hu authored
Fix broken time sync leeway with Geo See merge request !2208
-
Stan Hu authored
Previous versions did not properly set the IAT leeway properly, causing many Geo API requests to be marked invalid. The problem was that the ruby-jwt `master` used `iat_leeway` as the parameter, but v1.5.6 actually used `leeway`.
-
Stan Hu authored
Use curl --remote-name instead of curl -O to fix broken docs lint See merge request !2209
-
Rémy Coutable authored
CE to EE: refactor projects finder init collection ee See merge request !2199
-
Stan Hu authored
-
Rémy Coutable authored
EE version: Clean up the Project model to reduce conflicts See merge request !2056
-
Jacob Schatz authored
Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" See merge request !12354
-
Douwe Maan authored
Moves remote mirror, import and fork workers to their own queue See merge request !2177
-
Rémy Coutable authored
Add Rubocop Style/DotPosition Cop See merge request !2201
-
Sean McGivern authored
License files uploaded in the UI always have newlines as separators, with a single trailing newline. Licenses pasted in the text box will have newlines replaced by \r\n by the browser, and may have zero trailing newlines, or many. Normalising these to a canonical form lets us match against the license app more efficiently.
-
Toon Claes authored
The spec filename does not match the module/class name. But ignore it, because the `ee` subdir is added in between to avoid conflicts when merging from CE.
-
Achilleas Pipinellis authored
Fix typo with custom OpenSSH build instructions See merge request !2202
-
Douwe Maan authored
Namespace license checks for exporting issues (EES) Closes #2584 See merge request !2164
-
Phil Hughes authored
Fix transient remove issue from board and see milestone removed spec Closes #2660 See merge request !2139
-
Stan Hu authored
[ci skip]
-
Eric Eastwood authored
-
Eric Eastwood authored
-
Eric Eastwood authored
``` [Vue warn]: Invalid prop: type check failed for prop "idKey". Expected Number, got String. ``` We now fail on Vue warnings, https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12163/
-
Jacob Schatz authored
Fix Vue warnings in the MR Widget (EE) See merge request !2192
-
Jacob Schatz authored
Fix Vue warnings about string idKey in Related Issues See merge request !2190
-
Tiago Botelho authored
-
Achilleas Pipinellis authored
Add instructions for setting up a custom version of OpenSSH for Geo See merge request !2191
-
Achilleas Pipinellis authored
-
Toon Claes authored
CE and EE implement this differently, so abstract it out of VisibilityLevel.
-
Toon Claes authored
To limit the number of CE merge conflicts, move the auditor role code outside the original User model and into the EE-specific mixin.
-
Toon Claes authored
The permitted visibility levels for an auditor user should also include private, because it has read-only access to every project/group on the GitLab instance.
-
Yorick Peterse authored
This optimises how GroupProjectsFinder builds it collection, producing simpler and faster queries in the process. It also cleans up the code a bit to make it easier to understand.
-
Yorick Peterse authored
This method used to use a UNION, which would lead to it performing the same query twice; producing less than ideal performance. Further, in certain cases ActiveRecord could get confused and mess up the variable bindings, though it's not clear how/why exactly this happens. Fortunately we can work around all of this by building some of the WHERE conditions manually, allowing us to use a simple OR statement to get all the data we want without any of the above problems.
-
Yorick Peterse authored
This changes ProjectsFinder#init_collection so it no longer relies on a UNION. For example, to get starred projects of a user we used to run: SELECT projects.* FROM projects WHERE projects.pending_delete = 'f' AND ( projects.id IN ( SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id INNER JOIN project_authorizations ON projects.id = project_authorizations.project_id WHERE projects.pending_delete = 'f' AND project_authorizations.user_id = 1 AND users_star_projects.user_id = 1 UNION SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.visibility_level IN (20, 10) AND users_star_projects.user_id = 1 ) ) ORDER BY projects.id DESC; With these changes the above query is turned into the following instead: SELECT projects.* FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.pending_delete = 'f' AND ( EXISTS ( SELECT 1 FROM project_authorizations WHERE project_authorizations.user_id = 1 AND (project_id = projects.id) ) OR projects.visibility_level IN (20,10) ) AND users_star_projects.user_id = 1 ORDER BY projects.id DESC; This query in turn produces a better execution plan and takes less time, though the difference is only a few milliseconds (this however depends on the amount of data involved and additional conditions that may be added).
-
Yorick Peterse authored
This ensures that Project only includes a single prepend for EE::Project, which in turn takes care of the rest.
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
* master: (26 commits) Document the manual steps needed to use repmgr Update CHANGELOG.md for 9.2.7 Update CHANGELOG-EE.md for 9.2.7-ee Change GitLab version for object storage Speed up counting approvers when some are specified Fix bad connector - verify if both new and resolved issues are present before adding the connector. Re-enable autocomplete for milestones, tags, releases, and wiki Clarify that only when using CI_JOB_TOKEN multi-project pipelines exist Add link to issue for MySQL/subgroups drop support Fix duplicate testing of vm.triggered. Fix avatar images in pipeline and approval emails Fix some failing specs on master Change a few missing `login_as` to `gitlab_sign_in` Shush eslint. Add specs for coercing triggeredBy into a collection. Fix up specs that depend on triggered_by. Fix up propsData refs to triggered_by. Shush eslint. Update expected format for linked_pipelines_mack_data. Coerce triggered_by response into collection. ... Conflicts: spec/helpers/application_helper_spec.rb
-