Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Fix blocked user card styles | Annabel Dunstone Gray | 2018-08-08 | 2 | -2/+7 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch '50174-clarify-list-user-projects-api-endpoint' into 'master' | Achilleas Pipinellis | 2018-08-10 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clarify `List user projects` API Endpoint" Closes #50174 See merge request gitlab-org/gitlab-ce!21121 | |||||
| * | | | | | | | | clarify user namespace | Davin Walker | 2018-08-09 | 1 | -2/+1 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master' | Phil Hughes | 2018-08-10 | 3 | -4/+9 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce differences between CE and EE code base in reports components See merge request gitlab-org/gitlab-ce!21128 | |||||
| * | | | | | | | | Reduce differences between CE and EE code base in reports components | Filipa Lacerda | 2018-08-10 | 3 | -4/+9 | |
| | |_|_|/ / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch '2747-protected-environments-backend-ce' into 'master' | Kamil Trzciński | 2018-08-10 | 8 | -6/+49 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | CE Port of Protected Environments backend See merge request gitlab-org/gitlab-ce!20859 | |||||
| * | | | | | | | CE Port of Protected Environments backend | Mayra Cabrera | 2018-08-10 | 8 | -6/+49 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch '48320-cancel-a-created-job' into 'master' | Grzegorz Bizon | 2018-08-10 | 3 | -1/+12 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI: cancel/skip a job in "created" state using a button" Closes #48320 See merge request gitlab-org/gitlab-ce!20635 | |||||
| * | | | | | | | Allows to cancel a Created job | Jacopo | 2018-08-10 | 3 | -1/+12 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master' | Tim Zallmann | 2018-08-10 | 16 | -80/+300 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | port "Resolve "Mirroring interface improvements"" See merge request gitlab-org/gitlab-ce!20837 | |||||
| * | | | | | | Fix missed port | Luke Bennett | 2018-08-09 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | regenerate .pot | Luke Bennett | 2018-08-07 | 1 | -1/+4 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' of ↵ | Luke Bennett | 2018-08-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements | |||||
| | * | | | | | | Add in username help text | Dimitrie Hoekstra | 2018-08-06 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | port changes | Luke Bennett | 2018-08-07 | 3 | -6/+3 | |
| |/ / / / / / | ||||||
| * | | | | | | regenerate gitlab.pot | Luke Bennett | 2018-08-06 | 1 | -0/+6 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements' | Luke Bennett | 2018-08-06 | 1371 | -14674/+74695 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot | |||||
| * | | | | | | | regenerate gitlab.pot | Luke Bennett | 2018-08-03 | 1 | -3/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Review changes | Luke Bennett | 2018-08-03 | 2 | -7/+20 | |
| | | | | | | | | ||||||
| * | | | | | | | Move direction select to mirror_repos_form | Luke Bennett | 2018-08-03 | 2 | -10/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Make Pull default direction | Luke Bennett | 2018-08-03 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | use expect_mirror_to_have_error_and_timeago in remote_mirror_spec | Luke Bennett | 2018-08-03 | 1 | -6/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix direction select disabled | Luke Bennett | 2018-08-02 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | regenerate gitlab.pot | Luke Bennett | 2018-08-02 | 1 | -2/+63 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' of ↵ | Luke Bennett | 2018-08-02 | 2 | -5/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements | |||||
| | * | | | | | | | Fix settings.scss | Luke Bennett | 2018-08-02 | 1 | -4/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fix mirror_helper.rb EOF line | Luke Bennett | 2018-08-01 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | port specs | Luke Bennett | 2018-08-02 | 2 | -5/+8 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Disable direction select if 1 option | Luke Bennett | 2018-08-02 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | re-port | Luke Bennett | 2018-08-02 | 10 | -20/+55 | |
| | | | | | | | | ||||||
| * | | | | | | | port ProjectMirrorSerializerce-port-3959-mirroring-interface-improvements | Luke Bennett | 2018-07-25 | 2 | -0/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | Revert all schema.rb changes | Luke Bennett | 2018-07-25 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Revert some schema.rb changes | Luke Bennett | 2018-07-25 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove debugger | Luke Bennett | 2018-07-25 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | port | Luke Bennett | 2018-07-25 | 11 | -78/+187 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch '28930-add-project-reference-filter' into 'master' | Sean McGivern | 2018-08-10 | 11 | -73/+397 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GFM : provide 'project' reference in comment" Closes #28930 See merge request gitlab-org/gitlab-ce!20285 | |||||
| * | | | | | | | | Use a hash to memoize readable_project_ids with user objects as keys | Reuben Pereira | 2018-07-31 | 1 | -6/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove nodes_visible_to_user from ProjectParser and memoize readable_project_ids | Reuben Pereira | 2018-07-15 | 1 | -17/+10 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Use map instead of collect in the ProjectParser#projects_readable_by_user ↵ | Reuben Pereira | 2018-07-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function | |||||
| * | | | | | | | | Add back the Project#to_reference_with_postfix function since it can be used ↵ | Reuben Pereira | 2018-07-05 | 4 | -2/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the ProjectReferenceFilter#link_to_project function | |||||
| * | | | | | | | | Use a custom ProjectParser#nodes_visible_to_user function so that the user ↵ | Reuben Pereira | 2018-07-05 | 1 | -2/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions for all project references can be checked together | |||||
| * | | | | | | | | Remove the restriction preventing project references with text adjacent to ↵ | Reuben Pereira | 2018-07-04 | 2 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the > character | |||||
| * | | | | | | | | Correct the comment above the ProjectReferenceFilter.references_in method. | Reuben Pereira | 2018-07-03 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove the Project#to_reference_with_postfix method since it is only used in ↵ | Reuben Pereira | 2018-07-03 | 3 | -14/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the project_reference_filter_spec | |||||
| * | | | | | | | | Eager load a project's route and its namespace with route in ↵ | Reuben Pereira | 2018-07-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project_reference_filter | |||||
| * | | | | | | | | Add a changelog entry for MR 20285 - Add the ability to reference projects ↵ | Reuben Pereira | 2018-07-03 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in markdown | |||||
| * | | | | | | | | Eager load the namespace and route of a project in project_reference_filter.rb | Reuben Pereira | 2018-07-03 | 1 | -1/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Correct the comments above the ProjectReferenceFilter#project_link_filter ↵ | Reuben Pereira | 2018-07-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function to make it clear that the full project path is required in a reference. | |||||
| * | | | | | | | | Correct the misleading name of a variable in ↵ | Reuben Pereira | 2018-07-03 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProjectReferenceFilter.project_link_filter | |||||
| * | | | | | | | | Use literal '>' as escaped form of '>' | Reuben Pereira | 2018-07-03 | 1 | -1/+5 | |
| | | | | | | | | |