summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)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
* Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-161-5/+0
* Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master' Robert Speicher2017-01-161-4/+4
|\
| * Add a spec and actually display the flash noticeRémy Coutable2017-01-161-4/+4
* | Merge branch 'fix-deprecation-warning' into 'master' Rémy Coutable2017-01-161-1/+1
|\ \
| * | 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 d...Bruno Melli2017-01-141-1/+1
* | | | Allow to use + symbol in filenamesblackst0ne2017-01-151-2/+2
| |_|/ |/| |
* | | Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-tha...Douwe Maan2017-01-141-2/+2
|\ \ \ | |_|/ |/| |
| * | 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
* | | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-141-4/+11
|\ \ \
| * | | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-121-4/+11
| |/ /
* | | Merge branch 'env-var-in-redis-config' into 'master' Rémy Coutable2017-01-131-1/+1
|\ \ \
| * | | 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
* | | Adding 'IssueFinder' for 'projects' API endpointPanagiotis Atmatzidis2017-01-121-6/+8
|/ /
* | Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-123-8/+8
|\ \
| * | 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.ymlZ.J. van de Weg2017-01-051-1/+0
* | | | Merge branch 'search-bar-first-iteration' into 'master' Jacob Schatz2017-01-121-0/+1
|\ \ \ \
| * | | | 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.Horacio Sanson2017-01-124-1/+20
* | | | | | Merge branch 'do-not-remove-autodeploy-directory-when-fetching-ci-templates' ...Sean McGivern2017-01-121-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 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
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-0910-23/+70
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0521-4/+2960
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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
| * | | | | | | | | Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-2168-489/+1490
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2016-12-1617-12/+264
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-1518-43/+320
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ merge masterRegis2016-12-1315-141/+904
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0917-246/+260
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueGrzegorz Bizon2016-12-0736-99/+453
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Extract API pagination code to a separete moduleGrzegorz Bizon2016-12-072-38/+46
View Lorry Controller Status