summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed CSS based on MR discussion34349-select-branch-dropdown-is-too-close-to-branch-nameTim Zallmann2017-06-292-5/+1
* Fixes the branch dropdown margin on the commits page by reusing styles from t...Tim Zallmann2017-06-282-18/+29
* Merge branch '34430-fix-double-escape-comment-edit' into 'master'Phil Hughes2017-06-281-1/+1
|\
| * 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 repoJacob Vosmaer (GitLab)2017-06-2813-2/+105
|/ /
* | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-283-41/+30
|\ \
| * | 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"Annabel Dunstone Gray2017-06-2813-12/+624
|/ / /
* | | Merge branch 'backport-inline-loading-icon' into 'master'Phil Hughes2017-06-281-2/+13
|\ \ \
| * | | Backport inline loading_icon updates from EEbackport-inline-loading-iconEric Eastwood2017-06-271-2/+13
* | | | Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-2811-175/+141
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
* | | | Update architecture.mdSid Sijbrandij2017-06-281-0/+4
* | | | Merge branch 'ignore-generated-i18n-json-files' into 'master'Douwe Maan2017-06-2711-9/+4
|\ \ \ \
| * | | | 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 changelog entry file extensionGrzegorz Bizon2017-06-271-1/+1
| * | | | | 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 tha disables mmap_obj.gsub! as current implementation uses m...34221-fix-missing-method-in-mmap2-gemPawel Chojnacki2017-06-271-1/+1
* | | | | | Merge branch 'backport-system-check-fix' into 'master'Douwe Maan2017-06-272-0/+26
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Disable rainbow during SimpleExecutor specs to have consistencebackport-system-check-fixGabriel Mazetto2017-06-271-2/+11
| * | | | | Make the SimpleExecutor rescue exceptions in the executing ChecksGabriel Mazetto2017-06-272-2/+19
* | | | | | Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-277-27/+34
|\ \ \ \ \ \
| * | | | | | rubocop fix: don't use single line blocksbugfix/ruby2.4-compathttp://jneen.net/2017-06-261-2/+6
| * | | | | | rm use of deprecated webmock api in teamcity_service_spechttp://jneen.net/2017-06-261-2/+4
| * | | | | | rm use of deprecated webmock api in campfire_service_spechttp://jneen.net/2017-06-261-5/+6
| * | | | | | rm use of deprecated webmock api in jira model spechttp://jneen.net/2017-06-261-11/+11
| * | | | | | rm use of deprecated webmock api in bamboo_service_spechttp://jneen.net/2017-06-261-2/+2
| * | | | | | remove use of deprecated webmock feature in jira specshttp://jneen.net/2017-06-261-7/+7
| * | | | | | ruby 2.4 compat: update to webmock 2.3.2http://jneen.net/2017-06-262-4/+4
* | | | | | | Merge branch 'cherry-pick-ecd49e82' into 'master'Clement Ho2017-06-2731-34/+234
|\ \ \ \ \ \ \
View Lorry Controller Status