summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* fix member mapper specfix/import-usersJames Lopez2017-01-201-2/+0
|
* fix typoJames Lopez2017-01-191-1/+1
|
* fix and refactor note user mappingJames Lopez2017-01-182-9/+3
|
* added spec replicating the problemJames Lopez2017-01-181-1/+1
|
* do not map usersat all unless adminJames Lopez2017-01-181-2/+2
|
* Remove some useless require_relative statements26756-fix-already-intialized-constant-warningsRémy Coutable2017-01-173-7/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-161-5/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' Robert Speicher2017-01-161-4/+4
|\ | | | | | | | | Ensure updating project settings shows a flash message on success See merge request !8579
| * Add a spec and actually display the flash noticeRémy Coutable2017-01-161-4/+4
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-deprecation-warning' into 'master' Rémy Coutable2017-01-161-1/+1
|\ \ | | | | | | | | | | | | Fix a API deprecation warning See merge request !8587
| * | Fix a API deprecation warningfix-deprecation-warningRobert Schilling2017-01-161-1/+1
| | |
* | | Merge branch 'dot-in-project-queries' into 'master' Rémy Coutable2017-01-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Add a constraint on the query parameter to allow querying for projects with dots in their name. See merge request !8210
| * | | Add a constraint on the query parameter to allow querying for projects with ↵Bruno Melli2017-01-141-1/+1
| | | | | | | | | | | | | | | | dots in their name.
* | | | Allow to use + symbol in filenamesblackst0ne2017-01-151-2/+2
| |_|/ |/| |
* | | Merge branch ↵Douwe Maan2017-01-141-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | '25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-exist' into 'master' Resolve "`Gitlab::Checks::ChangeAccess` looks for user permissions that don't exist" Closes #25018 See merge request !8551
| * | Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-121-2/+2
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-141-4/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Metrics middleware: endpoint is nil" Closes #26587 See merge request !8544
| * | | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-121-4/+11
| |/ / | | | | | | | | | | | | | | | | | | `endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]` but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'env-var-in-redis-config' into 'master' Rémy Coutable2017-01-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Allow to use ENV variables in redis config See merge request !8073
| * | | Allow to use ENV variables in redis configSemyon Pupkov2017-01-131-1/+1
| |/ /
* | | API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpointDavid Eisner2017-01-121-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use IssuesFinder for the /issues API resouce - Tests for iid filter in project issues API resource - Tests for No Milestone filter in issues API resources The "No Milestone" case was not previously tested, and the `/issues` resource did not support the the `milestone` parameter. - Return issues where all labels match from the issues and project issues API resources, like the group issues resource already does. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6825#note_17474533 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Adding 'IssueFinder' for 'projects' API endpointPanagiotis Atmatzidis2017-01-121-6/+8
|/ / | | | | | | | | | | | | | | Current filtering for "/projects/:id/issues" endpoint returns no results for "No Milestone" query. This PR introduces fix by copying filtering from "/groups/:id/issues" which works as expected.
* | Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-123-8/+8
|\ \ | | | | | | | | | | | | Use configured git rather thans system git See merge request !8460
| * | Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-053-8/+8
| | |
* | | Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-121-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not check for valid url for .gitlab-ci.yml Closes #22970 See merge request !8451
| * | | Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until this commit, GitLab would check if the URL in your .gitlab-ci.yml would be valid and adressable. However, this approach is rather limited. To begin, the URL couldn't be http://example:$PORT/my-project, as the PORT value would be interpolated after checking if the URL was valid, which its not. Also this gem will limit the amount of protocols allowed. This commit doesn't check, at all, if the URL is valid. This is now the responsablilty of the user. In my opion this is right, as the user ultimately benefits from a correct URL, but also, its impossible to cover all cases.
* | | | Merge branch 'search-bar-first-iteration' into 'master' Jacob Schatz2017-01-121-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search bar first iteration Closes #21747 See merge request !7345
| * | | | Add username to gonClement Ho2017-01-091-0/+1
| | | | |
* | | | | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-buttonSean McGivern2017-01-124-1/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for PlantUML diagrams in Asciidoc. Closes #17603 See merge request !8537
| * | | | | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-124-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* | | | | | Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' ↵Sean McGivern2017-01-121-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Do not remove "autodeploy" directory when fetching CI templates See merge request !8517
| * | | | | Do not remove "autodeploy" directory when fetching CI templatesdo-not-remove-autodeploy-directory-when-fetching-ci-templatesAdam Niedzielski2017-01-101-1/+1
| |/ / / /
* | | | | Fix Users API to accept confirm parameterMark Fletcher2017-01-111-1/+1
| | | | |
* | | | | Fix Rubocop offenses in LDAP related code and specGrzegorz Bizon2017-01-101-2/+2
| | | | |
* | | | | Merge branch 'restore-backup-when-env-variable-is-passed' into 'master' Sean McGivern2017-01-101-17/+27
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Restore backup correctly when "BACKUP" environment variable is passed Closes #26090 See merge request !8477
| * | | | Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-091-17/+27
| | | | |
* | | | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-092-38/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pipelines Vue See merge request !7196
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-0910-23/+70
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0521-4/+2960
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * | | | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-046-29/+31
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix pipelines/index.html.haml merge conflictRegis2017-01-0217-205/+329
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merge master and fix application.rb conflictRegis2016-12-2318-45/+188
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove redundant pagination helpers after a bad mergeGrzegorz Bizon2016-12-211-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2168-489/+1490
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (367 commits) Set “Remove branch” button to default size remove unused helper method reduce common code even further to satisfy rake flay remove button class size alteration from revert and cherry pick links factor out common code to satisfy rake flay homogenize revert and cherry-pick button styles generated by commits_helper apply margin on alert banners only when there is one or more alerts Rename MattermostNotificationService back to MattermostService Rename SlackNotificationService back to SlackService Fix stage and pipeline specs and rubocop offenses Added QueryRecorder to test N+1 fix on Milestone#show Use gitlab-workhorse 1.2.1 Make 'unmarked as WIP' message more consistent Improve specs for Files API Allow unauthenticated access to Repositories Files API GET endpoints Add isolated view spec for pipeline stage partial Move test for HTML stage endpoint to controller specs Fix sizing of avatar circles; add border Fix broken test Fix broken test Changes after review ... Conflicts: app/assets/stylesheets/pages/pipelines.scss app/controllers/projects/pipelines_controller.rb app/views/projects/pipelines/index.html.haml spec/features/projects/pipelines/pipelines_spec.rb
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-1617-12/+264
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-1518-43/+320
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) Remove pages/snippets css Remove unused bootstrap imports Shift emojis and icons styles into framework Introduce deployment services, starting with a KubernetesService Username exists check respects the relative root URL add node_modules to our eslintignore settings Remove white space between nav items fix transient timing failure adding timecop Improve build status specs contexts descriptions Add some missing tests for detailed status methods Fix wrong error message expectation in API::Commits spec resolve all instances of no-undef eslint rule violations Remove trailing blank line from Allowable module expand remaining non-explicit eslint-disable blocks and factor ... Introduce $CI_BUILD_REF_SLUG Finish refactoring grays Combining more grays Remove duplicate shades of gray and black Encode when migrating ProcessCommitWorker jobs Prevent overflow with vertical scroll when we have space to show ... ...
| * \ \ \ \ \ \ \ \ \ \ \ merge masterRegis2016-12-1315-141/+904
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0917-246/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Update "Installation from source" guide for 8.15.0 Group links spec update Updates the font weight of button styles because of the change to system fonts Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Updated JS based on review Fixed group links dropdown to match Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' ... Conflicts: app/models/ci/pipeline.rb app/models/commit_status.rb app/views/projects/ci/pipelines/_pipeline.html.haml app/views/projects/commit/_pipeline.html.haml app/views/projects/pipelines/_with_tabs.html.haml app/views/projects/pipelines/index.html.haml lib/api/helpers.rb
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0736-99/+453
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (114 commits) Remove dashboard.scss Update custom_hooks.md for global custom hooks and chained hook info Move admin hooks spinach to rspec Move admin logs spinach test to rspec Fix 404 error when visit group label edit page A simpler implementation of finding a merge request Encourage bug reporters to mention if they use GitLab.com Bump gitlab-shell version to 4.0.3 Remove confirmation.scss Explain "js: true" in "deleted_source_branch_spec.rb" Move award emojis to framwork Move image styles to framework Remove tags.scss Remove caching of Repository#has_visible_content? Add text example for pipeline status without action Use detailed status as CSS class in pipelines list Use status text when redering pipelines list Improve support for icons in new detailed statuses Add status label information to pipeline header Untangle status label and text in ci status helper ...
| * | | | | | | | | | | | | | | Extract API pagination code to a separete moduleGrzegorz Bizon2016-12-072-38/+46
| | | | | | | | | | | | | | | |
View Lorry Controller Status