summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fix blocked user card stylesAnnabel Dunstone Gray2018-08-082-2/+7
| | | | | | | | |
* | | | | | | | | Merge branch '50174-clarify-list-user-projects-api-endpoint' into 'master'Achilleas Pipinellis2018-08-101-2/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clarify `List user projects` API Endpoint" Closes #50174 See merge request gitlab-org/gitlab-ce!21121
| * | | | | | | | clarify user namespaceDavin Walker2018-08-091-2/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fl-reduce-ee-conflicts-reports-code' into 'master'Phil Hughes2018-08-103-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 componentsFilipa Lacerda2018-08-103-4/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '2747-protected-environments-backend-ce' into 'master'Kamil Trzciński2018-08-108-6/+49
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | CE Port of Protected Environments backend See merge request gitlab-org/gitlab-ce!20859
| * | | | | | | CE Port of Protected Environments backendMayra Cabrera2018-08-108-6/+49
|/ / / / / / /
* | | | | | | Merge branch '48320-cancel-a-created-job' into 'master'Grzegorz Bizon2018-08-103-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 jobJacopo2018-08-103-1/+12
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master'Tim Zallmann2018-08-1016-80/+300
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | port "Resolve "Mirroring interface improvements"" See merge request gitlab-org/gitlab-ce!20837
| * | | | | | Fix missed portLuke Bennett2018-08-091-2/+2
| | | | | | |
| * | | | | | regenerate .potLuke Bennett2018-08-071-1/+4
| | | | | | |
| * | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' of ↵Luke Bennett2018-08-070-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements
| | * | | | | | Add in username help textDimitrie Hoekstra2018-08-061-0/+1
| | | | | | | |
| * | | | | | | port changesLuke Bennett2018-08-073-6/+3
| |/ / / / / /
| * | | | | | regenerate gitlab.potLuke Bennett2018-08-061-0/+6
| | | | | | |
| * | | | | | Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements'Luke Bennett2018-08-061371-14674/+74695
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot
| * | | | | | | regenerate gitlab.potLuke Bennett2018-08-031-3/+0
| | | | | | | |
| * | | | | | | Review changesLuke Bennett2018-08-032-7/+20
| | | | | | | |
| * | | | | | | Move direction select to mirror_repos_formLuke Bennett2018-08-032-10/+5
| | | | | | | |
| * | | | | | | Make Pull default directionLuke Bennett2018-08-031-2/+2
| | | | | | | |
| * | | | | | | use expect_mirror_to_have_error_and_timeago in remote_mirror_specLuke Bennett2018-08-031-6/+8
| | | | | | | |
| * | | | | | | Fix direction select disabledLuke Bennett2018-08-022-2/+2
| | | | | | | |
| * | | | | | | regenerate gitlab.potLuke Bennett2018-08-021-2/+63
| | | | | | | |
| * | | | | | | Merge branch 'ce-port-3959-mirroring-interface-improvements' of ↵Luke Bennett2018-08-022-5/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements
| | * | | | | | | Fix settings.scssLuke Bennett2018-08-021-4/+0
| | | | | | | | |
| | * | | | | | | Fix mirror_helper.rb EOF lineLuke Bennett2018-08-011-1/+1
| | | | | | | | |
| * | | | | | | | port specsLuke Bennett2018-08-022-5/+8
| |/ / / / / / /
| * | | | | | | Disable direction select if 1 optionLuke Bennett2018-08-021-1/+1
| | | | | | | |
| * | | | | | | re-portLuke Bennett2018-08-0210-20/+55
| | | | | | | |
| * | | | | | | port ProjectMirrorSerializerce-port-3959-mirroring-interface-improvementsLuke Bennett2018-07-252-0/+10
| | | | | | | |
| * | | | | | | Revert all schema.rb changesLuke Bennett2018-07-251-2/+1
| | | | | | | |
| * | | | | | | Revert some schema.rb changesLuke Bennett2018-07-251-3/+3
| | | | | | | |
| * | | | | | | Remove debuggerLuke Bennett2018-07-251-2/+0
| | | | | | | |
| * | | | | | | portLuke Bennett2018-07-2511-78/+187
| | | | | | | |
* | | | | | | | Merge branch '28930-add-project-reference-filter' into 'master'Sean McGivern2018-08-1011-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 keysReuben Pereira2018-07-311-6/+5
| | | | | | | | |
| * | | | | | | | Remove nodes_visible_to_user from ProjectParser and memoize readable_project_idsReuben Pereira2018-07-151-17/+10
| | | | | | | | |
| * | | | | | | | Use map instead of collect in the ProjectParser#projects_readable_by_user ↵Reuben Pereira2018-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function
| * | | | | | | | Add back the Project#to_reference_with_postfix function since it can be used ↵Reuben Pereira2018-07-054-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the ProjectReferenceFilter#link_to_project function
| * | | | | | | | Use a custom ProjectParser#nodes_visible_to_user function so that the user ↵Reuben Pereira2018-07-051-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions for all project references can be checked together
| * | | | | | | | Remove the restriction preventing project references with text adjacent to ↵Reuben Pereira2018-07-042-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the > character
| * | | | | | | | Correct the comment above the ProjectReferenceFilter.references_in method.Reuben Pereira2018-07-031-1/+1
| | | | | | | | |
| * | | | | | | | Remove the Project#to_reference_with_postfix method since it is only used in ↵Reuben Pereira2018-07-033-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the project_reference_filter_spec
| * | | | | | | | Eager load a project's route and its namespace with route in ↵Reuben Pereira2018-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project_reference_filter
| * | | | | | | | Add a changelog entry for MR 20285 - Add the ability to reference projects ↵Reuben Pereira2018-07-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in markdown
| * | | | | | | | Eager load the namespace and route of a project in project_reference_filter.rbReuben Pereira2018-07-031-1/+2
| | | | | | | | |
| * | | | | | | | Correct the comments above the ProjectReferenceFilter#project_link_filter ↵Reuben Pereira2018-07-031-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 Pereira2018-07-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProjectReferenceFilter.project_link_filter
| * | | | | | | | Use literal '>' as escaped form of '>'Reuben Pereira2018-07-031-1/+5
| | | | | | | | |