summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-041-0/+2
|\
| * Updated webpack configPhil Hughes2017-05-041-0/+1
| * Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-042-0/+12
| |\
| * \ Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-038-16/+38
| |\ \
| * | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-281-0/+1
* | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+1
| | |/ | |/|
* | | Merge branch '12910-uploader-pers-snippet' into 'master' Sean McGivern2017-05-041-0/+11
|\ \ \
| * | | Support uploaders for personal snippets comments12910-uploader-pers-snippetJarka Kadlecova2017-05-021-0/+11
* | | | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-0/+1
| |/ / |/| |
* | | Merge branch 'async-milestone-tabs' into 'master' Jacob Schatz2017-05-032-1/+10
|\ \ \
| * | | Load milestone tabs asynchronouslyPhil Hughes2017-04-262-1/+10
* | | | Merge branch 'remove-unused-initializer' into 'master' Douwe Maan2017-05-021-5/+0
|\ \ \ \
| * | | | Remove unused initializerremove-unused-initializerSean McGivern2017-05-021-5/+0
| | |/ / | |/| |
* | | | Merge branch 'metrics-deployment-history' into 'master' Douwe Maan2017-05-021-0/+2
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_...Pawel Chojnacki2017-04-2015-149/+286
| |\ \ \ \
| * | | | | Add endpoint that returns a list of deployments that happened within last 8.h...Pawel Chojnacki2017-03-281-0/+2
* | | | | | Merge branch 'dm-snippet-download-button' into 'master' Sean McGivern2017-05-022-3/+2
|\ \ \ \ \ \
| * | | | | | Add download button to project snippetsdm-snippet-download-buttonDouwe Maan2017-04-302-3/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-021-0/+8
|\ \ \ \ \ \
| * | | | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-021-0/+8
* | | | | | | Merge branch '19364-webhook-edit' into 'master' Dmitriy Zaporozhets2017-05-022-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Implement ability to update hooksAlexander Randa2017-04-282-3/+5
* | | | | | | | Merge branch 'pdflab-in-repo' into 'master' Phil Hughes2017-05-021-0/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Move PDFLab into GitLabpdflab-in-repoSam Rose2017-04-281-0/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Update Carrierwave and fog-coreZeger-Jan van de Weg2017-05-011-0/+2
| |_|/ / / / |/| | | | |
* | | | | | Resolve "rspec_profiling is enabled for MySQL"Rémy Coutable2017-04-281-4/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-282-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add test that asserts unicorns terminateJacob Vosmaer2017-04-262-0/+4
* | | | | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb"Dosuken shinya2017-04-281-1/+1
* | | | | Merge branch '12910-personal-snippet-prep-2' into 'master' Sean McGivern2017-04-261-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Support preview_markdown action for personal_snippetsJarka Kadlecova2017-04-261-0/+1
| |/ / /
* | | | Merge branch 'test-pg' into 'master' Rémy Coutable2017-04-243-2/+7
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-121-2/+2
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-122-4/+68
| |\ \ \ \ \
| * | | | | | Add # host for development and test as wellLin Jen-Shin2017-04-111-0/+2
| * | | | | | Set profiler only for postgresql not mysqlLin Jen-Shin2017-04-101-1/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-103-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-0710-33/+99
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-293-3/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-272-1/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Test both PostgreSQL and MySQL for the win.Lin Jen-Shin2017-03-241-1/+4
* | | | | | | | | | | Merge branch 'workhorse-secret-path' into 'master' Rémy Coutable2017-04-242-0/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make location of gitlab_workhorse_secret configurableJakub Jirutka2017-04-192-0/+11
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-211-1/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-193-7/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Don't use `send` in settings initializerSean McGivern2017-04-141-6/+6
| * | | | | | | | | Remove unused user activities codeSean McGivern2017-04-141-2/+2
| * | | | | | | | | Rename user cohorts -> cohortsSean McGivern2017-04-141-1/+1
| * | | | | | | | | Add user cohorts table to admin areaSean McGivern2017-04-141-0/+2