summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move the ee_compat_check job to the prepare stagerc/speedup-rake-jobsRémy Coutable2017-10-181-73/+71
* Speedup the gitlab_git_test jobRémy Coutable2017-10-181-8/+8
* New .dedicated-no-docs-pull-cache-job and .no-db-job definitionsRémy Coutable2017-10-182-88/+52
* Add date calls in .gitlab-ci.yml to see how long each step takeRémy Coutable2017-10-181-0/+24
* Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-186-7/+17
|\
| * Fix broken testkt/bug/fix-revision-and-size-for-container-registryFilipa Lacerda2017-10-171-2/+2
| * Fix failed testKamil Trzcinski2017-10-171-2/+2
| * Add short_revision and use total_sizeKamil Trzcinski2017-10-176-5/+15
* | Merge branch 'improve-database-yml-examples' into 'master'Rémy Coutable2017-10-183-18/+30
|\ \
| * | Update scripts/prepare_build.shbogdanvlviv2017-10-171-4/+2
| * | Update database.yml.postgresqlbogdanvlviv2017-10-171-11/+10
| * | Set 'staging specific' in database.yml.mysqlbogdanvlviv2017-10-171-3/+18
|/ /
* | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1733-735/+522
|\ \
| * | fixed Karam test because of event name changeph-multi-file-editor-restructure-dataPhil Hughes2017-10-171-2/+2
| * | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-1713-35/+60
| * | fixed prev directory row not correctly having colspanPhil Hughes2017-10-163-9/+9
| * | fixed karma spec with prev directory buttonPhil Hughes2017-10-161-0/+1
| * | fixed karma build because of a removed methodPhil Hughes2017-10-161-1/+1
| * | made serializing genericPhil Hughes2017-10-164-26/+26
| * | fixed rendering bugsPhil Hughes2017-10-166-18/+7
| * | Spec updatesPhil Hughes2017-10-1614-221/+175
| * | Refactored multi-file data structurePhil Hughes2017-10-1617-483/+301
* | | Merge branch 'add-inline-edit-button' into 'master'Filipa Lacerda2017-10-176-17/+119
|\ \ \
| * | | Add inline edit button to issue_show appClement Ho2017-10-176-17/+119
|/ / /
* | | Merge branch 'winh-project-deletion-message' into 'master'Annabel Dunstone Gray2017-10-172-2/+2
|\ \ \
| * | | Change project deletion message from alert to noticeWinnie Hellmann2017-10-172-2/+2
|/ / /
* | | Merge branch '20930-very-first-commit-to-default-branch-didn-t-close-referenc...Rémy Coutable2017-10-171-3/+5
|\ \ \
| * | | Fix #20930: automatic closing is not triggered on very first push.Sébastien2017-10-171-3/+5
|/ / /
* | | Merge branch 'move-user-avatar-specs' into 'master'Phil Hughes2017-10-173-0/+0
|\ \ \
| * | | Move user avatar specs to folder to mimic javascript directorymove-user-avatar-specsClement Ho2017-10-163-0/+0
* | | | Merge branch 'improve-sprite-icon-spec' into 'master'Phil Hughes2017-10-171-10/+18
|\ \ \ \
| * | | | Improve sprite icon specClement Ho2017-10-171-10/+18
|/ / / /
* | | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-176-36/+33
|\ \ \ \
| * | | | Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-176-36/+33
* | | | | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-174-2/+24
|\ \ \ \ \
| * | | | | Fix errors when deleting a forked projectBob Van Landuyt2017-10-174-2/+24
* | | | | | Merge branch '38156-breadcrumbs-margin' into 'master'Tim Zallmann2017-10-171-1/+1
|\ \ \ \ \ \
| * | | | | | Use variable for mobile breadcrumbs padding38156-breadcrumbs-marginAnnabel Dunstone Gray2017-10-161-1/+1
* | | | | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-173-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-163-0/+17
* | | | | | | | Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsan...Rémy Coutable2017-10-172-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-172-2/+20
* | | | | | | | | Merge branch 'fl-gke-collapsible-containers' into 'master'Phil Hughes2017-10-174-44/+67
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Adds collapsible sections in cluster pageFilipa Lacerda2017-10-174-44/+67
|/ / / / / / / /
* | | | | | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-172-14/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Update gitaly.mdZeger-Jan van de Weg2017-10-171-2/+4
| * | | | | | | | Update documentationZeger-Jan van de Weg2017-10-171-15/+3
| * | | | | | | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-162-14/+52
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/github-doc' into 'master'Rémy Coutable2017-10-171-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | clarify resuming importfix/github-docJames Lopez2017-10-171-0/+1
| | |_|/ / / / / | |/| | | | | |