summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Port gitlab-ee MR 3981 to CEdocs/add-aws-reference-diagramBrendan O'Leary2018-01-102-0/+4
|
* Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-105-4/+33
|\ | | | | | | | | | | | | Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
| * Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-errorEric Eastwood2018-01-095-4/+33
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491
* | Merge branch 'git-write-ref-prep' into 'master'Robert Speicher2018-01-104-11/+19
|\ \ | | | | | | | | | | | | | | | | | | Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
| * | Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prepKim "BKC" Carlbäcker2018-01-094-11/+19
| | |
* | | Merge branch ↵Achilleas Pipinellis2018-01-102-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29322-include-the-crowd-application-permission-information-on-the-crowd-omniauth-provider-page' into 'master' Resolve "Include the Crowd application permission information on the "Crowd OmniAuth Provider" page" Closes #29322 See merge request gitlab-org/gitlab-ce!16317
| * | | Resolve "Include the Crowd application permission information on the "Crowd ↵Xiaogang Wen2018-01-102-0/+12
|/ / / | | | | | | | | | OmniAuth Provider" page"
* | | Merge branch 'dz-fix-webmock' into 'master'Stan Hu2018-01-101-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Explicitly enable webmock in spinach env See merge request gitlab-org/gitlab-ce!16346
| * | | Explicitly enable webmock in spinach envDmitriy Zaporozhets2018-01-101-3/+3
| | | |
* | | | Merge branch 'docs-move-article-install-git' into 'master'Achilleas Pipinellis2018-01-104-109/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: move article "installing Git" to its topic-related dir See merge request gitlab-org/gitlab-ce!16322
| * | | | Docs: move article "installing Git" to its topic-related dirMarcia Ramos2018-01-104-109/+101
|/ / / /
* | | | Merge branch 'da-verify-integrity-of-uploaded-files' into 'master'Robert Speicher2018-01-104-0/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verify integrity of uploaded files" Closes #39949 See merge request gitlab-org/gitlab-ce!16297
| * | | | Add docs for ENV variables take gitlab:uploads:check rake task supportsda-verify-integrity-of-uploaded-filesDouglas Barbosa Alexandre2018-01-091-0/+13
| | | | |
| * | | | Fix small typosDouglas Barbosa Alexandre2018-01-092-4/+4
| | | | |
| * | | | Refactoring spec for the gitlab:uploads:check rake taskDouglas Barbosa Alexandre2018-01-081-6/+5
| | | | |
| * | | | Make Rubocop happyDouglas Barbosa Alexandre2018-01-081-1/+1
| | | | |
| * | | | Add docs for the gitlab:uploads:check rake taskDouglas Barbosa Alexandre2018-01-081-0/+20
| | | | |
| * | | | Add CHANGELOGDouglas Barbosa Alexandre2018-01-081-0/+5
| | | | |
| * | | | Add spec for gitlab:uploads rake tasksDouglas Barbosa Alexandre2018-01-081-0/+28
| | | | |
| * | | | Add rake task to check integrity of uploaded filesDouglas Barbosa Alexandre2018-01-081-0/+44
| | | | |
* | | | | Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-101-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LFS badge to merge request files tracked by LFS Closes #41829 See merge request gitlab-org/gitlab-ce!16345
| * | | | | Removed CHANGELOG entryPhil Hughes2018-01-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Added LFS to merge request files tracked by LFSmerge-request-lfs-badgePhil Hughes2018-01-102-0/+8
| | |/ / / | |/| | | | | | | | | | | | | Closes #41829
* | | | | Merge branch 'ph-dispatcher-1' into 'master'Filipa Lacerda2018-01-106-8/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added dispatcher imports for some routes See merge request gitlab-org/gitlab-ce!16284
| * | | | | Added admin:conversational_development_index:show import to dispatcherph-dispatcher-1Phil Hughes2018-01-092-1/+4
| | | | | |
| * | | | | Added import:fogbugz:new_user_map import to dispatcherPhil Hughes2018-01-092-1/+4
| | | | | |
| * | | | | Added ci:lints import to dispatcherPhil Hughes2018-01-093-2/+4
| | | | | |
| * | | | | Added import for snippets:show in dispatcherPhil Hughes2018-01-092-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | #41341
* | | | | | Merge branch 'docs/ci-cd-ref-note' into 'master'Marcia Ramos2018-01-101-9/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change order of reference notes in permissions docs Closes #41137 See merge request gitlab-org/gitlab-ce!16341
| * | | | | | Change order of reference notes in permissions docsdocs/ci-cd-ref-noteJohn Doe2018-01-101-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41137
* | | | | | | Merge branch '34312-eslint-vue-plugin' into 'master'Phil Hughes2018-01-10193-5178/+5878
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add eslint-vue-plugin to our stack" Closes #34312 See merge request gitlab-org/gitlab-ce!16210
| * | | | | | | Adds explanation to .codeclimate.yml file34312-eslint-vue-pluginFilipa Lacerda2018-01-101-0/+1
| | | | | | | |
| * | | | | | | Disable eslint in codeclimateFilipa Lacerda2018-01-101-1/+1
| | | | | | | |
| * | | | | | | Fix broken modalFilipa Lacerda2018-01-101-1/+1
| | | | | | | |
| * | | | | | | Disable rule in modal.vue breaking testsFilipa Lacerda2018-01-091-5/+3
| | | | | | | |
| * | | | | | | Fix broken testsFilipa Lacerda2018-01-094-104/+102
| | | | | | | |
| * | | | | | | Fix broken specsFilipa Lacerda2018-01-0911-50/+25
| | | | | | | |
| * | | | | | | Fix broken test for application rowFilipa Lacerda2018-01-091-2/+2
| | | | | | | |
| * | | | | | | Fix broken tests for project list and headerFilipa Lacerda2018-01-092-2/+2
| | | | | | | |
| * | | | | | | Fix application row specsFilipa Lacerda2018-01-091-7/+7
| | | | | | | |
| * | | | | | | [ci skip] Fix pagination specsFilipa Lacerda2018-01-092-5/+3
| | | | | | | |
| * | | | | | | Fix last eslint rulesFilipa Lacerda2018-01-089-156/+169
| | | | | | | |
| * | | | | | | Fix more eslint rulesFilipa Lacerda2018-01-0827-353/+402
| | | | | | | |
| * | | | | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-08197-2884/+12637
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (140 commits) Add Gitter room link to I want to contribute since you always have questions Use workhorse 3.4.0 chore: remove symbolic link Add memoization for properties Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`" Resolve "Add graph value to hover" Fix slash commands dropdown description disables the shortcut to the issue boards when issues are disabled Fix static analysys Disable STI of ActiveRecord. Refactoring specs. Fix StaticSnalysys Fix change log Add changelog Revert bulk_insert and bring back AR insert(one by one) Add a new test for emptified params Use batch update for Service deactivation Fix query to look for proper unmanaged kubernetes service Fix static anylysy Use bulk_insert instead of AR create Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template ...
| * | | | | | | Fixes more eslint rulesFilipa Lacerda2018-01-0627-455/+486
| | | | | | | |
| * | | | | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-0629-534/+595
| | | | | | | |
| * | | | | | | [ci skip] Fix conflictsFilipa Lacerda2018-01-051-28/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into 34312-eslint-vue-pluginFilipa Lacerda2018-01-05218-1140/+3570
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (78 commits) Use --left-right and --max-count for counting diverging commits API: get participants from merge_requests & issues Copy Mermaid graphs as GFM Rephrase paragraph about e2e tests in merge requests in docs Remove EE only sections from docs Update redis-rack to 2.0.4 Refactor matchers for background migrations Add id to modal.vue to support data-toggle="modal" Allow local tests to use a modified Gitaly Fix specs Use computed prop in expand button Update check.md add deprecation and removal issue to docs Add status attribute to runner api entity Fix typos in a code comment Refactor RelativePositioning so that it can be used by other classes Backport 'Rebase' feature from EE to CE Just try to detect and assign once Fix custom name in branch creation for issue in Firefox Modify `LDAP::Person` to return username value based on attributes ...
| * | | | | | | | [ci skip] Fix more eslint rulesFilipa Lacerda2018-01-057-380/+380
| | | | | | | | |
| * | | | | | | | [ci skip] Fix more rulesFilipa Lacerda2018-01-0534-920/+1035
| | | | | | | | |
View Lorry Controller Status