summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Catch what warden might throw when profiling requests to re-throw itfix/request-profiler-error-when-unauthenticatedAhmad Sherif2016-08-011-2/+8
* Merge branch 'fix/request-profiler-middleware-error-on-reload' into 'master' Douwe Maan2016-08-011-0/+1
|\
| * Fix RequestProfiler::Middleware error when code is reloaded in developmentfix/request-profiler-middleware-error-on-reloadAhmad Sherif2016-08-011-0/+1
* | Merge branch 'fix/use-fewer-queries-for-ci-charts' into 'master' Douwe Maan2016-08-011-26/+70
|\ \
| * | Use fewer queries for CI chartsfix/use-fewer-queries-for-ci-chartsAhmad Sherif2016-07-271-26/+70
* | | Merge branch 'fix/importing-io-timing-issue' into 'master' Rémy Coutable2016-08-011-1/+17
|\ \ \
| * | | refactored wait_for_archived_file methodfix/importing-io-timing-issueJames Lopez2016-08-011-6/+4
| * | | fix return value and specJames Lopez2016-08-011-1/+1
| * | | squashed - fix timing issues in prod importing projectsJames Lopez2016-08-011-1/+19
* | | | Merge branch '20473-rails-queue-duration' into 'master' Yorick Peterse2016-08-011-2/+1
|\ \ \ \
| * | | | Gitlab::Metrics.current_transaction needs to be public for RailsQueueDurationPaco Guzman2016-08-011-2/+1
| | |_|/ | |/| |
* | | | Trim extra displayed carriage returns in diffs and files with CRLFsStan Hu2016-08-011-1/+1
|/ / /
* | | Merge branch 'fix/labels-milestones-import' into 'master' Rémy Coutable2016-08-016-93/+173
|\ \ \
| * | | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-016-93/+173
| |/ /
* | | Merge branch 'zj-env-external-url' into 'master' Rémy Coutable2016-08-013-0/+92
|\ \ \ | |/ / |/| |
| * | Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-1/+5
| * | Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-292-48/+47
| * | Incorporate feedbackZ.J. van de Weg2016-07-291-4/+1
| * | Add API support for environmentsZ.J. van de Weg2016-07-293-0/+92
* | | Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-292-1/+19
|\ \ \
| * | | fix repo hooks missing on importfix/import-project-hooksJames Lopez2016-07-282-1/+19
* | | | Merge branch 'ability-batch-issue-checking' into 'master' Robert Speicher2016-07-291-3/+4
|\ \ \ \
| * | | | Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-291-3/+4
* | | | | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-298-66/+76
|\ \ \ \ \
| * | | | | Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-191-1/+1
| * | | | | Fix method visiblity in emoji filter classGrzegorz Bizon2016-07-191-5/+5
| * | | | | Fix methods visibility in markdown filter classGrzegorz Bizon2016-07-191-7/+7
| * | | | | Fix method visibility in gitlab metrics classGrzegorz Bizon2016-07-191-2/+2
| * | | | | Make banzai module that handles markdown singletonGrzegorz Bizon2016-07-191-7/+9
| * | | | | Fix method visibility in inline diff classGrzegorz Bizon2016-07-191-35/+39
| * | | | | Fix methods visibility in gitlab database moduleGrzegorz Bizon2016-07-191-2/+4
| * | | | | Refactor gitlab themes module to make it singletonGrzegorz Bizon2016-07-191-7/+9
* | | | | | Merge branch 'refactor/ci-config-move-job-entries' into 'master' Rémy Coutable2016-07-2920-260/+524
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Improve code, remove unused validator, improve namesGrzegorz Bizon2016-07-299-33/+19
| * | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-2220-147/+333
| |\ \ \ \ \
| * | | | | | Move job dependencies entry to the new CI configGrzegorz Bizon2016-07-202-15/+13
| * | | | | | Add minor readability, style improvements in CI configGrzegorz Bizon2016-07-207-19/+20
| * | | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-2038-287/+514
| |\ \ \ \ \ \
| * | | | | | | Move job environment validation to new CI configGrzegorz Bizon2016-07-194-17/+15
| * | | | | | | Move tags and allow_failure CI entries to new configGrzegorz Bizon2016-07-182-8/+8
| * | | | | | | Validate allowed keys only in new CI configGrzegorz Bizon2016-07-182-19/+5
| * | | | | | | Improve valid keys validation for CI config nodesGrzegorz Bizon2016-07-185-24/+12
| * | | | | | | Move job artifacts configuration new CI config codeGrzegorz Bizon2016-07-185-21/+71
| * | | | | | | Move job variables config entry to new CI configGrzegorz Bizon2016-07-182-17/+5
| * | | | | | | Move except and only job nodes to new CI configGrzegorz Bizon2016-07-182-1/+35
| * | | | | | | Move job image and services nodes to new CI configGrzegorz Bizon2016-07-182-9/+10
| * | | | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-1855-448/+1171
| |\ \ \ \ \ \ \
| * | | | | | | | Simplify abstract class for CI config entry nodesGrzegorz Bizon2016-07-154-39/+23
| * | | | | | | | Simplify CI config and remove logical validationGrzegorz Bizon2016-07-154-29/+10
| * | | | | | | | Add metadata to new CI config and expose job nameGrzegorz Bizon2016-07-157-32/+26