summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-282-1/+11
* 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
|\ \ \ \ \ \
| * | | | | | Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82Clement Ho2017-06-2631-34/+234
* | | | | | | Merge branch 'cherry-pick-91c122d5' into 'master'Clement Ho2017-06-271-49/+59
|\ \ \ \ \ \ \
| * | | | | | | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5Clement Ho2017-06-261-49/+59
| |/ / / / / /
* | | | | | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into 'ma...Robert Speicher2017-06-273-7/+19
|\ \ \ \ \ \ \
| * | | | | | | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nilRuben Davila2017-06-263-7/+19
* | | | | | | | Merge branch 'bpj-pipeline-schedules-form-bundle-refactor' into 'master'Phil Hughes2017-06-274-156/+176
|\ \ \ \ \ \ \ \
| * | | | | | | | Slightly refactor pipeline schedules form in preparation for additionsBryce Johnson2017-06-274-156/+176
|/ / / / / / / /
* | | | | | | | Merge branch 'dz-refactor-group-members-tests' into 'master'Douwe Maan2017-06-2710-139/+146
|\ \ \ \ \ \ \ \
| * | | | | | | | Move another group member spec from spinachdz-refactor-group-members-testsDmitriy Zaporozhets2017-06-262-7/+17
| * | | | | | | | Fix leave_group_spec.rbDmitriy Zaporozhets2017-06-261-3/+3
| * | | | | | | | Move "remove group member" spec from spinach to rspecDmitriy Zaporozhets2017-06-263-75/+92
View Lorry Controller Status