summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Review changesadd-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-054-7/+3
|
* Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-04131-861/+3167
|\ | | | | | | # Conflicts: # db/schema.rb
| * Merge branch '2274-store-last-repository-updated-at-ce' into 'master' Robert Speicher2017-05-0410-16/+95
| |\ | | | | | | | | | | | | Port of "2274-store-last-repository-updated-at" to CE See merge request !11085
| | * Fix Import/Export configuration spec2274-store-last-repository-updated-at-ceDouglas Barbosa Alexandre2017-05-041-0/+1
| | |
| | * Update last_repository_updated_at when the wiki is updatedDouglas Barbosa Alexandre2017-05-042-7/+16
| | |
| | * Update last_repository_updated_at when a push event is createdDouglas Barbosa Alexandre2017-05-042-8/+40
| | |
| | * Set last_repository_updated_at to created_at upon project creationDouglas Barbosa Alexandre2017-05-042-0/+13
| | |
| | * Add index to last_repository_updated_at on projectsDouglas Barbosa Alexandre2017-05-042-1/+17
| | |
| | * Add last_repository_updated_at to projectsDouglas Barbosa Alexandre2017-05-042-1/+9
| | |
| * | Merge branch '30329-web-gui-unable-to-create-new-branch-from-commit-sha' ↵Jacob Schatz2017-05-045-9/+75
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Web GUI: Unable to create new branch from commit SHA" Closes #30329 See merge request !10738
| | * | Resolve "Web GUI: Unable to create new branch from commit SHA"Luke "Jared" Bennett2017-05-045-9/+75
| |/ /
| * | Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master' Jacob Schatz2017-05-044-3/+51
| |\ \ | | |/ | |/| | | | | | | | | | | | | Fix MR target branch select dropdown placement cut-off Closes #31271 See merge request !10902
| | * Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdownEric Eastwood2017-05-014-3/+51
| | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271 When the dropdown items are too wide, constrain the dropdown to the offsetParent. Otherwise, let it naturally flow as Select2 wants.
| * | Merge branch 'deploy-keys-load-async' into 'master' Filipa Lacerda2017-05-0427-37/+961
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys load async Closes #29667 See merge request !10973
| | * | Fixed Karma specdeploy-keys-load-asyncPhil Hughes2017-05-042-4/+13
| | | |
| | * | Updated webpack configPhil Hughes2017-05-042-5/+2
| | | |
| | * | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-04203-1298/+4346
| | |\ \
| | * | | Fixed karma specsPhil Hughes2017-05-031-2/+2
| | | | |
| | * | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-05-03472-2184/+8995
| | |\ \ \
| | * | | | Component specsPhil Hughes2017-05-026-6/+237
| | | | | |
| | * | | | Started specs [ci skip]Phil Hughes2017-05-023-1/+166
| | | | | |
| | * | | | Fixed some spinach & rspec testsPhil Hughes2017-04-285-13/+32
| | | | | |
| | * | | | Updated some Vue specific JSPhil Hughes2017-04-287-16/+13
| | | | | |
| | * | | | Fixed public keys always rendering even when emptyPhil Hughes2017-04-281-0/+1
| | | | | |
| | * | | | Re-wrote to match our docs - still not 100% sure but closer than it wasPhil Hughes2017-04-2815-115/+384
| | | | | |
| | * | | | Merge branch 'master' into deploy-keys-load-asyncPhil Hughes2017-04-28117-408/+2700
| | |\ \ \ \
| | * | | | | Add timeagoJacob Schatz2017-04-271-2/+6
| | | | | | |
| | * | | | | Add Vue with async deploy keysJacob Schatz2017-04-273-21/+107
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/29667-deploy-keys' into ↵Jacob Schatz2017-04-278-2/+148
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | deploy-keys-load-async
| | | * | | | | expose additional values in deploy key entity29667-deploy-keysJarka Kadlecova2017-04-072-0/+4
| | | | | | | |
| | | * | | | | Project deploy keys json end pointJarka Kadlecova2017-03-248-2/+144
| | | | | | | |
| * | | | | | | Merge branch 'bvl-reject-ee-namespace-names' into 'master' Douwe Maan2017-05-042-0/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject EE reserved namespace paths in CE as well Closes #31800 See merge request !11095
| | * | | | | | | Reject EE reserved namespace paths in CE as wellbvl-reject-ee-namespace-namesBob Van Landuyt2017-05-042-0/+14
| | | | | | | | |
| * | | | | | | | Merge branch '31824-move-bundler-audit-job-to-static-analysis-job' into ↵Robert Speicher2017-05-042-12/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include the bundler:audit job into the static-analysis job Closes #31824 See merge request !11092
| | * | | | | | | | Include the bundler:audit job into the static-analysis job31824-move-bundler-audit-job-to-static-analysis-jobRémy Coutable2017-05-042-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | Merge branch 'backport-ee-1800-add-enable-map-to-gfm-auto-complete' into ↵27070-rename-gitlab-slash-commands-to-quick-actionsPhil Hughes2017-05-041-67/+102
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add enableMap to gl.GfmAutoComplete for partial re-use -- EE backport See merge request !11073
| | * | | | | | | | Add enableMap to gl.GfmAutoComplete for partial re-usebackport-ee-1800-add-enable-map-to-gfm-auto-completeEric Eastwood2017-05-031-67/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1800
| * | | | | | | | | Merge branch '31760-add-tooltips-to-note-actions' into 'master' Filipa Lacerda2017-05-043-6/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tooltips to note action buttons Closes #31760 See merge request !11082
| | * | | | | | | | | Add tooltips to note action buttons31760-add-tooltips-to-note-actionsAnnabel Dunstone Gray2017-05-033-6/+10
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-0417-139/+425
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018
| | * | | | | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-0417-139/+425
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'tags-sort-default' into 'master' Robert Speicher2017-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed tags sort dropdown being empty Closes #31618 See merge request !11055
| * | | | | | | | | | | Merge branch 'docs/gb/document-serializers' into 'master' Rémy Coutable2017-05-041-0/+325
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document serializers Closes #26758 See merge request !11059
| | * | | | | | | | | | Document serializersGrzegorz Bizon2017-05-041-0/+325
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'docs/30141-improve-contributing-guide' into 'master' Robert Speicher2017-05-043-112/+259
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Combine all GitLab workflow documentation to CONTRIBUTING.md" Closes #30141 See merge request !10991
| | * | | | | | | | | | Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.mddocs/30141-improve-contributing-guideRémy Coutable2017-05-043-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | | | | | Update ToC of CONTRIBUTING.md and PROCESS.mdRémy Coutable2017-05-032-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | | | | | Improve the Code review guidelines documentationRémy Coutable2017-05-032-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | | | | | Improve the merge request guidelines and DoD in CONTRIBUTING.mdRémy Coutable2017-05-031-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | | | | | | Move retro/kickoff doc to PROCESS.mdRémy Coutable2017-05-032-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status