Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | adjust EE landing page to unify CE and EE docsdocs/introduce-ee-unified-docs | Marcia Ramos | 2017-06-27 | 1 | -8/+20 | |
* | | | | | | | | | | | | | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-06-28 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fix steps numbering | Nitin Madhok | 2017-06-27 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | Merge branch 'dz-cleanup-codeclimate-json' into 'master' | Kamil Trzciński | 2017-06-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Improve sed regex for codeclimate ci jobdz-cleanup-codeclimate-json | Dmitriy Zaporozhets | 2017-06-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | Update .gitlab-ci.yml | Dmitriy Zaporozhets | 2017-06-27 | 0 | -0/+0 | |
| * | | | | | | | | | | | | | | | | | Remove unused data from code climate artifact | Dmitriy Zaporozhets | 2017-06-27 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch '34430-fix-double-escape-comment-edit' into 'master' | Phil Hughes | 2017-06-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Remove unnecessary call to `_.escape`34430-fix-double-escape-comment-edit | kushalpandya | 2017-06-28 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'gitlab-git-test-in-tree' into 'master' | Rémy Coutable | 2017-06-28 | 13 | -2/+105 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Vendor the gitlab-git-test repo | Jacob Vosmaer (GitLab) | 2017-06-28 | 13 | -2/+105 | |
|/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | Merge branch 'submodules-private' into 'master' | Sean McGivern | 2017-06-28 | 3 | -41/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Make Gitlab::Ggit::Repository#submodules private | Jacob Vosmaer | 2017-06-27 | 3 | -41/+30 | |
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch '34023-navigation-sidebar' into 'master'34424-default-removing-source-branch-in-merge-request-for-non-long-running-branch | Phil Hughes | 2017-06-28 | 13 | -12/+624 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Resolve "Navigation - Move contextual navigation to sidebar" | Annabel Dunstone Gray | 2017-06-28 | 13 | -12/+624 | |
|/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'backport-inline-loading-icon' into 'master' | Phil Hughes | 2017-06-28 | 1 | -2/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Backport inline loading_icon updates from EEbackport-inline-loading-icon | Eric Eastwood | 2017-06-27 | 1 | -2/+13 | |
* | | | | | | | | | | | | | | | | Merge branch 'refactor-emoji-utils' into 'master' | Tim Zallmann | 2017-06-28 | 11 | -175/+141 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | revert removal of requestAnimationFrame and move to a separate MR/discussionrefactor-emoji-utils | Mike Greiling | 2017-06-27 | 1 | -2/+8 | |
| * | | | | | | | | | | | | | | | rename getEmojiCategoryMap and remove unnecessary parameter | Mike Greiling | 2017-06-27 | 2 | -9/+9 | |
| * | | | | | | | | | | | | | | | move glEmojiTag method to emoji helper | Mike Greiling | 2017-06-27 | 6 | -87/+68 | |
| * | | | | | | | | | | | | | | | split emoji support methods from the async module | Mike Greiling | 2017-06-27 | 7 | -12/+16 | |
| * | | | | | | | | | | | | | | | export validEmojiNames for autocomplete | Mike Greiling | 2017-06-26 | 2 | -2/+3 | |
| * | | | | | | | | | | | | | | | replace emojiAlias references with normalizeEmojiName helper | Mike Greiling | 2017-06-26 | 1 | -5/+3 | |
| * | | | | | | | | | | | | | | | namespace emoji helper methods within AwardsHandler class | Mike Greiling | 2017-06-26 | 1 | -13/+8 | |
| * | | | | | | | | | | | | | | | move emoji category index to helper method | Mike Greiling | 2017-06-26 | 2 | -27/+32 | |
| * | | | | | | | | | | | | | | | move emojiAlias logic into helper module | Mike Greiling | 2017-06-26 | 2 | -16/+17 | |
| * | | | | | | | | | | | | | | | fix method definition styling | Mike Greiling | 2017-06-26 | 1 | -12/+2 | |
| * | | | | | | | | | | | | | | | move normalizeEmojiName method to emoji helper module | Mike Greiling | 2017-06-26 | 3 | -20/+14 | |
| * | | | | | | | | | | | | | | | remove problematic use of requestAnimationFrame | Mike Greiling | 2017-06-26 | 1 | -8/+2 | |
| * | | | | | | | | | | | | | | | update import locations for karma specs | Mike Greiling | 2017-06-23 | 2 | -4/+3 | |
| * | | | | | | | | | | | | | | | centralize emoji helper methods | Mike Greiling | 2017-06-23 | 7 | -21/+22 | |
| * | | | | | | | | | | | | | | | refactor option defaults | Mike Greiling | 2017-06-23 | 1 | -5/+2 | |
* | | | | | | | | | | | | | | | | Update CHANGELOG.md for 9.3.2 | Clement Ho | 2017-06-27 | 3 | -9/+5 | |
* | | | | | | | | | | | | | | | | Update architecture.md | Sid Sijbrandij | 2017-06-28 | 1 | -0/+4 | |
| |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'ignore-generated-i18n-json-files' into 'master' | Douwe Maan | 2017-06-27 | 11 | -9/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | updated gitlab-ci.yml to compile localeignore-generated-i18n-json-files | Phil Hughes | 2017-06-27 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | | | Ignore JSON files generated from PO files | Ruben Davila | 2017-06-27 | 10 | -9/+1 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'fix-head-pipeline-for-commit-status' into 'master' | Grzegorz Bizon | 2017-06-27 | 3 | -6/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fix changelog entry file extension | Grzegorz Bizon | 2017-06-27 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | Fix head pipeline stored in merge request for external pipelinesfix-head-pipeline-for-commit-status | Kamil Trzcinski | 2017-06-27 | 3 | -6/+28 | |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch '34221-fix-missing-method-in-mmap2-gem' into 'master' | Douwe Maan | 2017-06-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses m...34221-fix-missing-method-in-mmap2-gem | Pawel Chojnacki | 2017-06-27 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | Merge branch 'backport-system-check-fix' into 'master' | Douwe Maan | 2017-06-27 | 2 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fix | Gabriel Mazetto | 2017-06-27 | 1 | -2/+11 | |
| * | | | | | | | | | | | | | | | Make the SimpleExecutor rescue exceptions in the executing Checks | Gabriel Mazetto | 2017-06-27 | 2 | -2/+19 | |
* | | | | | | | | | | | | | | | | Merge branch 'bugfix/ruby2.4-compat' into 'master' | Douwe Maan | 2017-06-27 | 7 | -27/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | rubocop fix: don't use single line blocksbugfix/ruby2.4-compat | http://jneen.net/ | 2017-06-26 | 1 | -2/+6 | |
| * | | | | | | | | | | | | | | | rm use of deprecated webmock api in teamcity_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | | | rm use of deprecated webmock api in campfire_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -5/+6 |