summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | refactor fetcher and fixed specsJames Lopez2017-01-174-34/+22
| | | | | | | |
| | * | | | | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-1713-61/+89
| | | | | | | |
| | * | | | | | Fix other spec failuresJames Lopez2017-01-175-44/+5
| | | | | | | |
| | * | | | | | more refactoring and fixing old specsJames Lopez2017-01-171-15/+3
| | | | | | | |
| | * | | | | | added new summary serializers and refactor all of the summary stuff into ↵James Lopez2017-01-175-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separate logical classes
| | * | | | | | fixed stage entity and added missing stage specsJames Lopez2017-01-171-1/+5
| | | | | | | |
| | * | | | | | added analytics stage serializer and moved some info to the stage classes ↵James Lopez2017-01-178-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the controller
| | * | | | | | WIP - started refactoring cycle analytics median stuff into stagesJames Lopez2017-01-1718-19/+111
| | |/ / / / /
| * | | | | | Merge branch 'time-tracking-api' into 'master' Sean McGivern2017-01-186-11/+144
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time tracking API Closes #25861 See merge request !8483
| | * | | | | | Add some API endpoints for time tracking.Ruben Davila2017-01-186-11/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New endpoints are: POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_estimate" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_time_estimate" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/add_spent_time" POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_spent_time" GET :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_stats"
| * | | | | | | Merge branch 'rs-data_attribute-cleanup' into 'master' Douwe Maan2017-01-181-3/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct documentation for `data_attribute` method See merge request !8603
| | * | | | | | | Correct documentation for `data_attribute` methodrs-data_attribute-cleanupRobert Speicher2017-01-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also break up a long line, just 'cause.
| * | | | | | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-182-0/+32
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | Backport timetracking to CE See merge request !8195
| | * | | | | | Backport backend work for time tracking.Ruben Davila2017-01-152-0/+32
| | | | | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \ \
View Lorry Controller Status