summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-0/+23
|\
| * Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-0/+23
* | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-194-0/+147
|\ \
| * | More improvements to presenters23563-document-presentersRémy Coutable2017-01-184-50/+51
| * | Improve presenter factoryRémy Coutable2017-01-182-48/+42
| * | Improve presenter architectureRémy Coutable2017-01-184-29/+104
| * | Document presentersRémy Coutable2017-01-182-0/+77
* | | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-192-0/+77
|\ \ \
| * | | Add detailed statuses for external commit statusesGrzegorz Bizon2017-01-172-0/+77
| |/ /
* | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-1824-137/+286
|\ \ \
| * | | refactored a bunch of stuff based on feedbackJames Lopez2017-01-171-3/+3
| * | | fix specsJames Lopez2017-01-173-20/+5
| * | | refactored metrics fetcher - merged into stage and eventsJames Lopez2017-01-171-2/+3
| * | | fix specs, refactor missing bits from events stuffJames Lopez2017-01-179-33/+17
| * | | big refactor based on MR feedbackJames Lopez2017-01-179-10/+11
| * | | fix spec failures after mergeJames Lopez2017-01-173-5/+5
| * | | few fixes after mergeJames Lopez2017-01-171-2/+2
| * | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-172-2/+2
| * | | Fix other spec failuresJames Lopez2017-01-171-0/+59
| * | | Fix other spec failuresJames Lopez2017-01-179-63/+96
| * | | fixed stage entity and added missing stage specsJames Lopez2017-01-178-0/+86
| |/ /
* | | Backport backend work for time tracking.Ruben Davila2017-01-152-0/+15
|/ /
* | Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-tha...Douwe Maan2017-01-141-3/+0
|\ \
| * | Remove useless permission checks in Gitlab::Checks::ChangeAccess25018-gitlab-checks-changeaccess-looks-for-user-permissions-that-don-t-existRémy Coutable2017-01-121-3/+0
| |/
* | Merge branch '26587-metrics-middleware-endpoint-is-nil' into 'master' Yorick Peterse2017-01-141-0/+11
|\ \
| * | Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-121-0/+11
| |/
* | Allow to use ENV variables in redis configSemyon Pupkov2017-01-131-1/+15
|/
* Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-122-17/+13
|\
| * Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-052-17/+13
* | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+4
* | 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-16/+98
|\ \
| * | Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-091-16/+98
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-095-13/+94
|\ \ \
| * \ \ Merge branch '19086-double-newline' into 'master' Sean McGivern2017-01-091-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Test newline and carraige return groupsJared Deckard2016-12-281-0/+8
| * | | Merge branch 'feature/log-ldap-to-application-log' into 'master' Rémy Coutable2017-01-091-8/+55
| |\ \ \
| | * | | fixup! Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-1/+1
| | * | | Log messages when blocking/unblocking LDAP accountsMarkus Koller2016-12-201-8/+55
| * | | | Merge branch 'track_last_used_date_of_ssh_keys' into 'master' Sean McGivern2017-01-091-0/+1
| |\ \ \ \
| | * | | | Record and show last used date of SSH KeysVincent Wong2017-01-091-0/+1
| | | |/ / | | |/| |
| * | | | LDAP attributes needs default valuesDrew Blessing2017-01-062-5/+30
| | |_|/ | |/| |
* | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0514-0/+3404
|\ \ \ \ | |/ / /
| * | | Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_gitRobert Speicher2017-01-042-2/+2
| * | | Absorb gitlab_gitRobert Speicher2017-01-0414-0/+3404
* | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-041-0/+44
|\ \ \ \ | |/ / /
| * | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-0/+44
* | | | fix pipelines/index.html.haml merge conflictRegis2017-01-027-22/+55
|\ \ \ \ | |/ / /
| * | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-291-1/+11
| |\ \ \ | | |/ / | |/| |
| | * | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-291-1/+11
View Lorry Controller Status