summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Actually log sidekiq on start_sidekiqmrchrisw-actually-log-sidekiqChris Wilson2017-03-081-1/+1
* Merge branch 'dynamic-todos-fixture' into 'master' Clement Ho2017-02-145-6/+59
|\
| * Replace static fixture for right_sidebar_spec.js (!9211)winniehell2017-02-145-15/+38
| * Add dynamic fixture for todoswinniehell2017-02-141-0/+30
* | Merge branch '27755-pipeline-docs' into 'master' Achilleas Pipinellis2017-02-143-0/+30
|\ \
| * | Add image description27755-pipeline-docsMark Pundsack2017-02-101-1/+1
| * | Add image titlesMark Pundsack2017-02-061-2/+2
| * | Add development workflowsMark Pundsack2017-02-062-1/+17
| * | Update imageMark Pundsack2017-02-061-1/+1
| * | Add imageMark Pundsack2017-02-062-1/+5
| * | Document types of pipelinesMark Pundsack2017-02-061-0/+10
* | | Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'mast...Rémy Coutable2017-02-1410-2/+146
|\ \ \
| * | | Execute web hooks for WikiPage delete operationMark Fletcher2017-02-145-2/+38
| * | | Add tests for WikiPages servicesMark Fletcher2017-02-143-0/+91
| * | | Make WikiPage comparable according to StaticModel interfaceMark Fletcher2017-02-142-0/+17
* | | | Merge branch '23061-consolidate-project-lists' into 'master' Sean McGivern2017-02-149-396/+146
|\ \ \ \
| * | | | API: Consolidate /projects endpointToon Claes2017-02-149-396/+146
* | | | | Merge branch '27656-doc-ci-enable-ci' into 'master' Achilleas Pipinellis2017-02-144-9/+13
|\ \ \ \ \
| * | | | | Update doc for enabling or disabling GitLab CITakuya Noguchi2017-02-054-9/+13
* | | | | | Merge branch '26286-most-recent-activity-profile-header' into 'master' Annabel Dunstone Gray2017-02-142-0/+6
|\ \ \ \ \ \
| * | | | | | Add 'Most Recent Activity' header to the User Profile pageJan Christophersen2017-02-132-0/+6
* | | | | | | Merge branch 'use-es6-promise-package' into 'master' Alfredo Sumaran2017-02-143-1158/+2
|\ \ \ \ \ \ \
| * | | | | | | Use es6-promise package to avoid webpack warningsuse-es6-promise-packageEric Eastwood2017-02-133-1158/+2
* | | | | | | | Merge branch '27932-merge-request-pipelines-displays-json' into 'master' Alfredo Sumaran2017-02-143-1/+23
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-json27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1029-245/+125
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Adds verification in case the endpoint already has `.json`Filipa Lacerda2017-02-102-2/+20
| * | | | | | | | | Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1048-129/+418
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-107-8/+31
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-109-13/+35
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27932-merge-request-pipelines-displays-jsonFilipa Lacerda2017-02-1070-411/+404
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Adds `.json` to the endpoint requested in order to avoid showing JSONFilipa Lacerda2017-02-092-1/+5
* | | | | | | | | | | | | | Merge branch '27924-set-max-width-mini-pipeline-text' into 'master' Filipa Lacerda2017-02-142-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Set max width for text in mini pipeline graph27924-set-max-width-mini-pipeline-textSam Rose2017-02-142-1/+5
* | | | | | | | | | | | | | | Merge branch 'remove-inactive-default-email-services' into 'master' Lin Jen-Shin (godfat)2017-02-142-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use Gitlab::Database.with_connection_pool from !9192remove-inactive-default-email-servicesLin Jen-Shin2017-02-142-41/+24
| * | | | | | | | | | | | | | Disconnect the pool after doneLin Jen-Shin2017-02-141-0/+1
| * | | | | | | | | | | | | | Use threads directly, introduce pool later:Lin Jen-Shin2017-02-142-53/+33
| * | | | | | | | | | | | | | Revert "Bump schema to pass `rake db:setup`"Lin Jen-Shin2017-02-141-1/+1
| * | | | | | | | | | | | | | Introduce ThreadedConnectionPool for customized poolLin Jen-Shin2017-02-142-28/+65
| * | | | | | | | | | | | | | Bump schema to pass `rake db:setup`Lin Jen-Shin2017-02-141-1/+1
| * | | | | | | | | | | | | | Try this way to provide database connectionLin Jen-Shin2017-02-141-6/+3
| * | | | | | | | | | | | | | Use IS FALSE for both pg and mysql; Handle connectionsLin Jen-Shin2017-02-141-9/+11
| * | | | | | | | | | | | | | Run two threads to improve migration running timeLin Jen-Shin2017-02-141-3/+17
| * | | | | | | | | | | | | | Remove inactive default email servicesLin Jen-Shin2017-02-142-0/+31
* | | | | | | | | | | | | | | Merge branch 'docs/database-info' into 'master' Achilleas Pipinellis2017-02-142-42/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add MySQL info in install requirementsAchilleas Pipinellis2017-02-142-42/+52
* | | | | | | | | | | | | | | Merge branch 'create-connection-pool' into 'master' Yorick Peterse2017-02-142-0/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Only ensure against yield so that pool should be availablecreate-connection-poolLin Jen-Shin2017-02-141-4/+5
| * | | | | | | | | | | | | | | Have some simple way to create connection poolLin Jen-Shin2017-02-142-0/+72
* | | | | | | | | | | | | | | | Merge branch '14492-change-fork-endpoint' into 'master'Sean McGivern2017-02-146-136/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \