summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-imple...Kamil Trzciński2017-04-062-0/+6
|\
| * Change configuration in gitlab.com as trigger_schedule_worker will perform tw...Shinya Maeda2017-04-061-1/+1
| * Change configuration in gitlab.com as trigger_schedule_worker will perform tw...Shinya Maeda2017-04-061-1/+1
| * Rename ScheduledTrigger to TriggerSchedule. Because table structure changed.Shinya Maeda2017-04-062-4/+4
| * Add config for workerShinya Maeda2017-04-062-0/+6
* | Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into feature/multi-le...feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-062-0/+4
|\ \ | |/
| * Merge branch 'fix/gh-import-status-check' into 'master' Sean McGivern2017-04-061-0/+3
| |\
| | * Periodically mark projects that are stuck in importing as failedJames Lopez2017-04-051-0/+3
| * | STL file viewerPhil Hughes2017-04-061-0/+1
* | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-065-16/+32
|\ \ \ | |/ /
| * | Issue title realtimeRegis Boudinot2017-04-062-0/+2
| * | Merge branch 'gitaly-prevent-autoload' into 'master' Rémy Coutable2017-04-051-13/+1
| |\ \
| | * | Deal with Rails autoload instance variable resetsJacob Vosmaer2017-04-051-13/+1
| * | | Use PDFLab to render PDFs in GitLabSam Rose2017-04-051-1/+7
| | |/ | |/|
| * | Load a preview of Sketch 43 filessketch-preview-filesJacob Schatz2017-04-052-0/+19
| |/
| * use a less memory-intensive sourcemap when running in CIMike Greiling2017-04-041-1/+2
| * Refactor test_utils bundleMike Greiling2017-04-041-1/+0
| * Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into 'mas...Douwe Maan2017-04-041-0/+1
| |\
| | * adds git terminal prompt env var to application rb24187-set-git-terminal-prompt-env-var-in-initializerTiago Botelho2017-04-031-0/+1
* | | Fix Rubocop offenses related to registry routesGrzegorz Bizon2017-04-051-2/+2
* | | Improve container repository tags controller routeGrzegorz Bizon2017-04-051-5/+4
* | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-044-9/+12
|\ \ \ | |/ /
| * | Enable the `bullet_logger` setting; enable `raise` in test environmentrs-bullet-raiseRobert Speicher2017-04-031-4/+9
| |/
| * Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-connAhmad Sherif2017-04-032-2/+2
| * Relax constraint on Wiki IDs, since subdirectories can contain spacessh-relax-wiki-slug-constraintStan Hu2017-04-021-3/+1
* | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-037-25/+64
|\ \ | |/
| * Merge branch '24784-system-notes-meta-data' into 'master' Sean McGivern2017-03-301-1/+1
| |\
| | * Add system_note_metadata modelJarka Kadlecova2017-03-281-1/+1
| * | Merge branch '29843-project-subgroup-transfer' into 'security'Rémy Coutable2017-03-291-0/+2
| * | Merge branch 'gitaly-socket-per-shard' into 'master' Sean McGivern2017-03-293-21/+46
| |\ \
| | * | Change socket_path to gitaly_addressJacob Vosmaer2017-03-292-11/+25
| | * | Expand relative paths in storagesJacob Vosmaer2017-03-291-10/+19
| | * | Separate GRPC channels per repository storageJacob Vosmaer2017-03-292-2/+4
| * | | Merge branch 'ipython-notebook-viewer' into 'master' Jacob Schatz2017-03-281-0/+2
| |\ \ \
| | * | | Started iPython notebook viewerPhil Hughes2017-03-231-0/+2
| * | | | Merge branch 'fix/gb/environments-folders-route' into 'master' Kamil Trzciński2017-03-281-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix environment folder route when special chars presentGrzegorz Bizon2017-03-271-1/+1
| | | |/ | | |/|
| * | | spread out webpack bundles per-line to reduce conflicts in EEMike Greiling2017-03-271-1/+5
| * | | Merge branch '29787-monitor-ee-rspec-tests-separately' into 'master' Sean McGivern2017-03-271-1/+5
| |\ \ \
| | * | | RSpec profiling: Prepend the branch name with `ce` or `ee`Rémy Coutable2017-03-241-1/+5
| | |/ /
| * | | Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serialize...Kamil Trzciński2017-03-271-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Rename endpoints 'status' to 'pipeline_status' in merge_requestsShinya Maeda2017-03-231-1/+1
| | * | Expose only status. ci_cd_status to status. Support abstract class.Shinya Maeda2017-03-231-3/+2
| | * | Add api points for ci cd status. Add favicon.Shinya Maeda2017-03-231-0/+3
| | |/
* | | Move code related to registry to multiple controllersGrzegorz Bizon2017-03-311-0/+6
* | | Reorganize container repository controllers and viewsGrzegorz Bizon2017-03-311-1/+4
|/ /
* | Merge branch 'refactor-templates-js' into 'master' Alfredo Sumaran2017-03-241-1/+1
|\ \
| * | Lightly refactor js files related to file template selectors.Bryce Johnson2017-03-221-1/+1
| |/
* | Introduce a new middleware for the test environment that can block requestsRémy Coutable2017-03-221-0/+3
|/
* move common vue script to vue_shared directoryMike Greiling2017-03-211-1/+1
View Lorry Controller Status