summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-041-1/+3
|\
| * Don’t close issues on original project from a forkPaco Guzman2016-08-041-1/+3
* | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-0/+4
|\ \
| * | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-0/+4
* | | Merge branch 'fix/import-error' into 'master' Rémy Coutable2016-08-041-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-031-1/+1
* | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-1/+1
* | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-036-41/+21
* | | Introduce Compare model in the codebase.Paco Guzman2016-08-035-17/+19
* | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-037-5/+162
* | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-034-5/+23
|/ /
* | fix TODO comment [ci skip]James Lopez2016-08-021-1/+1
|/
* 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/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
* | | Gitlab::Metrics.current_transaction needs to be public for RailsQueueDurationPaco Guzman2016-08-011-2/+1
| |/ |/|
* | squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-016-93/+173
|/
* 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 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-295-47/+55
|\ \
| * | Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-191-1/+1
| * | Fix method visibility in gitlab metrics classGrzegorz Bizon2016-07-191-2/+2
| * | 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-2919-89/+505
|\ \ \
| * | | Improve code, remove unused validator, improve namesGrzegorz Bizon2016-07-299-33/+19
| * | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-226-58/+114
| |\ \ \
| * | | | Move job dependencies entry to the new CI configGrzegorz Bizon2016-07-201-1/+3
| * | | | Add minor readability, style improvements in CI configGrzegorz Bizon2016-07-206-16/+18
| * | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-2026-183/+322
| |\ \ \ \
| * | | | | Move job environment validation to new CI configGrzegorz Bizon2016-07-193-6/+15
| * | | | | Move tags and allow_failure CI entries to new configGrzegorz Bizon2016-07-181-0/+8
| * | | | | Validate allowed keys only in new CI configGrzegorz Bizon2016-07-181-0/+5
| * | | | | Improve valid keys validation for CI config nodesGrzegorz Bizon2016-07-184-15/+12
| * | | | | Move job artifacts configuration new CI config codeGrzegorz Bizon2016-07-184-1/+71
| * | | | | Move job variables config entry to new CI configGrzegorz Bizon2016-07-181-1/+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-181-1/+10
| * | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-1834-226/+867
| |\ \ \ \ \
| * | | | | | 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-156-30/+24
| * | | | | | Remove job cache configfrom legacy yaml processorGrzegorz Bizon2016-07-141-1/+5
| * | | | | | Remove references to global entry in new CI configGrzegorz Bizon2016-07-142-2/+1
| * | | | | | Revert logical validation in CI job stage entryGrzegorz Bizon2016-07-142-17/+0
View Lorry Controller Status