summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix invalid component name for ShaMismatch state.acet-mr-widget-component-name-fixFatih Acet2018-05-081-1/+1
|
* Merge branch 'blackst0ne-replace-spinach-project-ff-merge-requests.feature' ↵Robert Speicher2018-05-087-133/+87
|\ | | | | | | | | | | | | into 'master' Replace the `project/ff_merge_requests.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18800
| * Replace the `project/ff_merge_requests.feature` spinach test with an rspec ↵blackst0ne2018-05-087-133/+87
|/ | | | analog
* Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into ↵Stan Hu2018-05-085-6/+32
|\ | | | | | | | | | | | | 'master' Raise InvalidRepository error for non-valid git repositories See merge request gitlab-org/gitlab-ce!18594
| * Update Gitaly version to 0.99.0Douglas Barbosa Alexandre2018-05-071-1/+1
| |
| * Add CHANGELOGDouglas Barbosa Alexandre2018-05-071-0/+6
| |
| * Raise InvalidRepository error for non-valid git repositoriesDouglas Barbosa Alexandre2018-05-073-5/+25
| |
* | Merge branch '46010-add-missing-parens' into 'master'Kamil Trzciński2018-05-082-25/+25
|\ \ | | | | | | | | | | | | Add missing parens to make consistent in project_spec and runner_spec See merge request gitlab-org/gitlab-ce!18808
| * | Add some missing parens in project_spec and runner_specDylan Griffith2018-05-082-25/+25
| | |
* | | Merge branch 'update-asset-sync' into 'master'Robert Speicher2018-05-082-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Update asset_sync ~> 2.2.0 to ~> 2.4 See merge request gitlab-org/gitlab-ce!18762
| * | | Update asset_sync ~> 2.2.0 to ~> 2.4Pirate Praveen2018-05-052-4/+4
| | | |
* | | | Merge branch 'fix_plural_handling_for_migration_to_ghost_user' into 'master'Robert Speicher2018-05-082-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cleanly handle plural name for ghost user migration See merge request gitlab-org/gitlab-ce!18798
| * | | | Cleanly handle plural name for ghost user migrationOlivier Gonzalez2018-05-072-3/+3
| | | | |
* | | | | Merge branch 'fix/gb/add-pipeline-builds-foreign-key' into 'master'Kamil Trzciński2018-05-084-0/+74
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add database foreign key between pipelines and builds Closes #46035 See merge request gitlab-org/gitlab-ce!18822
| * | | | | Reduce scope of orphaned builds to be removedGrzegorz Bizon2018-05-081-1/+1
| | | | | |
| * | | | | Remove orphaned builds without project / pipeline referenceGrzegorz Bizon2018-05-082-3/+8
| | | | | |
| * | | | | Add changelog for pipeline build foreign keyGrzegorz Bizon2018-05-082-1/+5
| | | | | |
| * | | | | Add database foreign key between pipelines and buildsGrzegorz Bizon2018-05-083-0/+65
| | | | | |
* | | | | | Merge branch 'dz-squash-old-migrations' into 'master'Douwe Maan2018-05-0886-1136/+335
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash migrations from 2013 See merge request gitlab-org/gitlab-ce!18547
| * | | | | | Squash migrations prior to 2014-03-14Dmitriy Zaporozhets2018-04-2486-1136/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch '44319-remove-gray-buttons' into 'master'Phil Hughes2018-05-085-17/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove remaining grey buttons" Closes #44319 See merge request gitlab-org/gitlab-ce!18795
| * | | | | | | Remove gray button styleAnnabel Dunstone Gray2018-05-075-17/+12
| | | | | | | |
* | | | | | | | Merge branch 'remove-trailing-remote-mirror-todo' into 'master'Douwe Maan2018-05-081-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes RemoteMirror related TODO from project_spec See merge request gitlab-org/gitlab-ce!18814
| * | | | | | | | Removes RemoteMirror related TODO from project_specTiago Botelho2018-05-081-2/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/missing-developer-process-link' into 'master'Douwe Maan2018-05-081-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing security process link for developers See merge request gitlab-org/gitlab-ce!18812
| * | | | | | | | | Add missing security process for developersJames Lopez2018-05-081-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-shorcut-modal' into 'master'Filipa Lacerda2018-05-082-1/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix modal width of shortcuts help page See merge request gitlab-org/gitlab-ce!18766
| * | | | | | | | Add changelog entryLars Greiss2018-05-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
| * | | | | | | | Fix modal width of shorcuts help pageLars Greiss2018-05-071-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
* | | | | | | | Merge branch 'ide-mr-icon-fixes' into 'master'Filipa Lacerda2018-05-081-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tooltip & spacing of merge request icon in IDE Closes #46121 and #46123 See merge request gitlab-org/gitlab-ce!18805
| * | | | | | | Fixed tooltip & spacing of merge request icon in IDEPhil Hughes2018-05-081-2/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Closes #46123, #46121
* | | | | | | Merge branch '46136-fix-dependencies' into 'master'Phil Hughes2018-05-082-0/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add sha1 dependency EE backport" Closes #46136 See merge request gitlab-org/gitlab-ce!18804
| * | | | | | | Backport of EE added dependencyFilipa Lacerda2018-05-082-0/+16
| | | | | | | |
* | | | | | | | Merge branch ↵Nick Thomas2018-05-082-2/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46130-ce-remote_mirrors-table-should-have-boolean-enabled-set-to-false' into 'master' Resolve "CE remote_mirrors table should have boolean enabled set to `false`" Closes #46130 See merge request gitlab-org/gitlab-ce!18801
| * | | | | | | | Add MakeRemoteMirrorsDisabledByDefault DB migrationAsh McKenzie2018-05-082-2/+13
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'dm-ensure-import-state-persisted' into 'master'Grzegorz Bizon2018-05-081-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create import_state until project is persisted See merge request gitlab-org/gitlab-ce!18803
| * | | | | | | | Don't create import_state until project is persistedDouwe Maan2018-05-081-2/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'feature-expose-runner-ip-to-api' into 'master'Kamil Trzciński2018-05-083-0/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose runner ip address to runners API Closes #46102 See merge request gitlab-org/gitlab-ce!18799
| * | | | | | | Add changelog entryLars Greiss2018-05-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
| * | | | | | | Expose runner ip address to runners APILars Greiss2018-05-082-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
* | | | | | | | Merge branch 'fix-reactive-cache-retry-rate' into 'master'Douwe Maan2018-05-083-14/+30
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update commit status from external CI services less aggressively Closes #46131 See merge request gitlab-org/gitlab-ce!18802
| * | | | | | | Update commit status from external CI services less aggressivelyNick Thomas2018-05-083-14/+30
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-failed-jobs-tab' into 'master'Grzegorz Bizon2018-05-084-12/+60
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Fix failed jobs tab See merge request gitlab-org/gitlab-ce!18520
| * | | | | | Respect permissions when showing Failed JobsKamil Trzciński2018-05-064-12/+60
| | | | | | |
* | | | | | | Merge branch 'vendor-auto-devops-template-in-10-8' into 'master'Mayra Cabrera2018-05-081-23/+166
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!18797
| * | | | | | | Vendor Auto-DevOps.gitlab-ci.ymlFabio Busatto2018-05-081-23/+166
|/ / / / / / /
* | | | | | | Merge branch ↵Stan Hu2018-05-083-20/+81
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '5794-we-should-failover-gracefully-when-we-can-t-connect-to-geo-tracking-database-ce' into 'master' Backport: Keep ShaAttribute from halting startup when we can’t connect to a database See merge request gitlab-org/gitlab-ce!18726
| * | | | | | | Backport: Keep ShaAttribute from halting startup when we can’t connect to ↵Brett Walker2018-05-083-20/+81
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | a database
* | | | | | | Merge branch 'blackst0ne-replace-spinach-project-builds-artifacts.feature' ↵Robert Speicher2018-05-078-344/+159
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Replace the `project/builds/artifacts.feature` spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!18729
| * | | | | | Replace the `project/builds/artifacts.feature` spinach test with an rspec analogblackst0ne2018-05-078-344/+159
|/ / / / / /