summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'fix-find-file-breadcrumbs' into 'master'Tim Zallmann2017-06-282-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix find file breadcrumb styling Closes #34427 See merge request !12510
| * | | | | | | | | | | | | | | Fix find file breadcrumb stylingfix-find-file-breadcrumbsPhil Hughes2017-06-282-1/+3
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34427
* | | | | | | | | | | | | | | Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-283-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271
| * | | | | | | | | | | | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-283-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression caused by the backlog list being re-added Closes #33850
* | | | | | | | | | | | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master'Grzegorz Bizon2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared examples to their correct location See merge request !12488
| * | | | | | | | | | | | | | | Move share examples to their correct locationfix-duplicate-shared-examplesRémy Coutable2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'docs/introduce-ee-unified-docs' into 'master'Achilleas Pipinellis2017-06-281-8/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce unified docs to CE landing page See merge request !12482
| * | | | | | | | | | | | | | | | adjust EE landing page to unify CE and EE docsdocs/introduce-ee-unified-docsMarcia Ramos2017-06-271-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | == https://gitlab.com/gitlab-org/gitlab-ee/commit/30304bd2ab3c87d6304a3d4c4 bd71ab7ffd2794b from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2265
* | | | | | | | | | | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-06-281-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the numbering of steps in the 9.2 to 9.3 upgrade guide See merge request !12498
| * | | | | | | | | | | | | | | | | Fix steps numberingNitin Madhok2017-06-271-3/+3
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'dz-cleanup-codeclimate-json' into 'master'Kamil Trzciński2017-06-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused data from code climate artifact See merge request !12494
| * | | | | | | | | | | | | | | | | Improve sed regex for codeclimate ci jobdz-cleanup-codeclimate-jsonDmitriy Zaporozhets2017-06-271-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Update .gitlab-ci.ymlDmitriy Zaporozhets2017-06-270-0/+0
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Remove unused data from code climate artifactDmitriy Zaporozhets2017-06-271-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '34430-fix-double-escape-comment-edit' into 'master'Phil Hughes2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape` Closes #34430 See merge request !12505
| * | | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape`34430-fix-double-escape-comment-editkushalpandya2017-06-281-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'gitlab-git-test-in-tree' into 'master'Rémy Coutable2017-06-2813-2/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor the gitlab-git-test repo Closes #32133 See merge request !12429
| * | | | | | | | | | | | | | | | | Vendor the gitlab-git-test repoJacob Vosmaer (GitLab)2017-06-2813-2/+105
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-283-41/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitlab::Git::Repository#submodules private See merge request !12479
| * | | | | | | | | | | | | | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-273-41/+30
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '34023-navigation-sidebar' into 'master'34424-default-removing-source-branch-in-merge-request-for-non-long-running-branchPhil Hughes2017-06-2813-12/+624
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar" Closes #34023 See merge request !12470
| * | | | | | | | | | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar"Annabel Dunstone Gray2017-06-2813-12/+624
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'backport-inline-loading-icon' into 'master'Phil Hughes2017-06-281-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport inline prop on loading_icon from EE See merge request !12490
| * | | | | | | | | | | | | | | Backport inline loading_icon updates from EEbackport-inline-loading-iconEric Eastwood2017-06-271-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2246#note_33577729
* | | | | | | | | | | | | | | | Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-2811-175/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor emoji helpers in preparation for async loading See merge request !12432
| * | | | | | | | | | | | | | | revert removal of requestAnimationFrame and move to a separate MR/discussionrefactor-emoji-utilsMike Greiling2017-06-271-2/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | rename getEmojiCategoryMap and remove unnecessary parameterMike Greiling2017-06-272-9/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | move glEmojiTag method to emoji helperMike Greiling2017-06-276-87/+68
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | split emoji support methods from the async moduleMike Greiling2017-06-277-12/+16
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | export validEmojiNames for autocompleteMike Greiling2017-06-262-2/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | replace emojiAlias references with normalizeEmojiName helperMike Greiling2017-06-261-5/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | namespace emoji helper methods within AwardsHandler classMike Greiling2017-06-261-13/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | move emoji category index to helper methodMike Greiling2017-06-262-27/+32
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | move emojiAlias logic into helper moduleMike Greiling2017-06-262-16/+17
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix method definition stylingMike Greiling2017-06-261-12/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | move normalizeEmojiName method to emoji helper moduleMike Greiling2017-06-263-20/+14
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | remove problematic use of requestAnimationFrameMike Greiling2017-06-261-8/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | update import locations for karma specsMike Greiling2017-06-232-4/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | centralize emoji helper methodsMike Greiling2017-06-237-21/+22
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | refactor option defaultsMike Greiling2017-06-231-5/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update CHANGELOG.md for 9.3.2Clement Ho2017-06-273-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Update architecture.mdSid Sijbrandij2017-06-281-0/+4
| |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ignore-generated-i18n-json-files' into 'master'Douwe Maan2017-06-2711-9/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore JSON files generated from PO files See merge request !12329
| * | | | | | | | | | | | | | | updated gitlab-ci.yml to compile localeignore-generated-i18n-json-filesPhil Hughes2017-06-271-0/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Ignore JSON files generated from PO filesRuben Davila2017-06-2710-9/+1
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master'Grzegorz Bizon2017-06-273-6/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478
| * | | | | | | | | | | | | | | Fix changelog entry file extensionGrzegorz Bizon2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-statusKamil Trzcinski2017-06-273-6/+28
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master'Douwe Maan2017-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mmap2 gem to fix missing symbol error that happens on some installations from source Closes #34221 See merge request !12492
| * | | | | | | | | | | | | | | Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses ↵34221-fix-missing-method-in-mmap2-gemPawel Chojnacki2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method that is no longer part of Ruby API