summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Return last edited time instead of update time4416-description-timestampJan Provaznik2018-01-114-4/+23
* Merge branch 'mk-add-geo-support-for-artifacts' into 'master'Stan Hu2018-01-1046-26/+1238
|\
| * Clarify in UI that only local files are syncedMichael Kozono2018-01-102-12/+12
| * Add changelog entryMichael Kozono2018-01-101-0/+5
| * Add job artifacts to /admin/geo_nodesMichael Kozono2018-01-1015-5/+170
| * Create JobArtifactDeletedEvent on destroy artifactMichael Kozono2018-01-105-1/+142
| * Delete job artifact on JobArtifactDeletedEventMichael Kozono2018-01-1010-2/+239
| * Primary supports api/transfers/job_artifact/:idMichael Kozono2018-01-103-0/+87
| * Secondaries request job artifacts from the primaryMichael Kozono2018-01-1016-12/+589
* | Merge branch 'ee-41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-105-4/+33
|\ \
| * | Fix 500 when visiting a commit where blobs do not exist (nil blobs)Eric Eastwood2018-01-105-4/+33
|/ /
* | Merge branch 'groups-destroy-service-race-condition-spec-deletion' into 'master'Stan Hu2018-01-101-56/+0
|\ \ | |/ |/|
| * Removes potential race condition specs from Groups::DestroyServiceTiago Botelho2018-01-101-56/+0
|/
* Merge branch 'remove-beta-notice-for-clusters' into 'master'Achilleas Pipinellis2018-01-101-3/+0
|\
| * Remove Beta notice for ClustersFabio Busatto2018-01-101-3/+0
* | Merge branch 'ee-ph-dispatcher-1' into 'master'Filipa Lacerda2018-01-106-8/+25
|\ \
| * | EE port of ph-dispatcher-1Phil Hughes2018-01-106-8/+25
* | | Merge branch '4242-failure-in-spec-ee-spec-services-ee-geo-hashed_storage_att...Sean McGivern2018-01-101-0/+4
|\ \ \
| * | | Fix HashedStorageAttachmentsEventStore spec when repo is already on diskDouglas Barbosa Alexandre2018-01-101-0/+4
| |/ /
* | | Merge branch 'ee-34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10232-6718/+7542
|\ \ \ | |_|/ |/| |
| * | Ee 34312 eslint vue pluginFilipa Lacerda2018-01-10232-6718/+7542
|/ /
* | Merge branch 'sh-fix-webmock' into 'master'Dmitriy Zaporozhets2018-01-105-6/+10
|\ \ | |/ |/|
| * Use webmock config from rspec in the spinachDmitriy Zaporozhets2018-01-101-4/+3
| * Stub elastic search setting in spinach testsDmitriy Zaporozhets2018-01-103-0/+6
| * Properly disable WebMock and fix specStan Hu2018-01-092-4/+3
* | Merge branch 'ce-to-ee-2018-01-09' into 'master'Luke Bennett2018-01-1068-326/+568
|\ \
| * | Merge branch 'fix-group-hooks-mock' into 'master'Dmitriy Zaporozhets2018-01-101-0/+2
| * | Fix schema.rb conflict resolutionMichael Kozono2018-01-091-1/+0
| * | Resolve conflict in schema.rbMichael Kozono2018-01-091-3/+0
| * | Resolve conflicts in 20160301174731_add_fingerprint_index.rbMichael Kozono2018-01-091-3/+0
| * | Resolve conflicts in index.mdMichael Kozono2018-01-091-3/+0
| * | Resolve conflicts in fast_ssh_key_lookup.mdMichael Kozono2018-01-091-39/+0
| * | Resolve conflicts in _form.html.hamlMichael Kozono2018-01-091-3/+1
| * | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-09GitLab Bot2018-01-0974-305/+601
| |\ \
| | * \ Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'Douwe Maan2018-01-094-0/+91
| | |\ \
| | | * | Fixing bug related to wiki last versionFrancisco Javier López2018-01-094-0/+91
| | |/ /
| | * | Merge branch 'improve-ssh-lookup-docs' into 'master'Douwe Maan2018-01-092-28/+6
| | |\ \
| | | * | Use the new gitlab-shell authorized-keys helper in documentationNick Thomas2018-01-092-28/+6
| | * | | Merge branch '41570-max-height-dropdown' into 'master'Phil Hughes2018-01-095-11/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Change max-height of all dropdowns to 312px41570-max-height-dropdownAnnabel Dunstone Gray2018-01-085-11/+7
| | * | | Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-095-4/+25
| | |\ \ \
| | | * | | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsisPhil Hughes2018-01-095-4/+25
| | * | | | Merge branch 'master' into 'master'Achilleas Pipinellis2018-01-091-1/+1
| | |\ \ \ \
| | | * | | | fix example in ci ssh_keys documentationVincent Lae2017-12-211-1/+1
| | * | | | | Merge branch 'docs-push-web-hook-note' into 'master'Achilleas Pipinellis2018-01-091-0/+6
| | |\ \ \ \ \
| | | * | | | | Add note about only 20 commits being included in push payloaddocs-push-web-hook-noteDrew Blessing2017-12-271-0/+6
| | * | | | | | Merge branch 'docs/rs-fix-changelog-header-level' into 'master'Achilleas Pipinellis2018-01-091-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix the header level for the Changelog Arguments documentationdocs/rs-fix-changelog-header-levelRobert Speicher2017-12-281-1/+1
| | * | | | | | | Merge branch 'docs-19843-specify-archive-sha-options' into 'master'Achilleas Pipinellis2018-01-091-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Specifies the accepted refs for downloading an archive via the APIMark Fletcher2018-01-041-1/+1
View Lorry Controller Status