| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into ↵15041-Add-Custom-CI-Config-Path | Lin Jen-Shin | 2017-06-28 | 9734 | -129764/+459899 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15041-Add-Custom-CI-Config-Path * upstream/master: (12506 commits) Update CHANGELOG.md for 9.3.2 Update architecture.md Fix changelog entry file extension Fix head pipeline stored in merge request for external pipelines updated gitlab-ci.yml to compile locale Ignore JSON files generated from PO files Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API Disable rainbow during SimpleExecutor specs to have consistence Slightly refactor pipeline schedules form in preparation for additions Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" Make the SimpleExecutor rescue exceptions in the executing Checks Resolve "Unable to access edit comment from dropdown menu in certain screen sizes" Update changelog item revert removal of requestAnimationFrame and move to a separate MR/discussion rename getEmojiCategoryMap and remove unnecessary parameter Action Buttons on Prio Labels working again by setting pointer events to none on… Remove 'contains' option from Commit.find_all Remove Gitlab::Git::Repository#find_all Use latest chrome and chrome driver in GitLab QA Polish sidebar toggle ... | ||||
| | * | Merge branch 'refactor-emoji-utils' into 'master' | Tim Zallmann | 2017-06-28 | 11 | -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-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 |
| | | | | | | | | | | [ci skip] | ||||
| | * | | 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 |
| | |\ \ | | | | | | | | | | | | | | | | | Ignore JSON files generated from PO files See merge request !12329 | ||||
| | | * | | 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 head pipeline stored in merge request for external pipelines Closes #34130 See merge request !12478 | ||||
| | | * | | | Fix changelog entry file extension | Grzegorz Bizon | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| | | * | | | 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 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-gem | Pawel Chojnacki | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | method that is no longer part of Ruby API | ||||
| | * | | | | | Merge branch 'backport-system-check-fix' into 'master' | Douwe Maan | 2017-06-27 | 2 | -0/+26 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Make the SimpleExecutor rescue exceptions in the executing Checks See merge request !12487 | ||||
| | | * | | | | 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 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471 | ||||
| | | * | | | | | 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 |
| | | | | | | | | |||||
| | | * | | | | | rm use of deprecated webmock api in jira model spec | http://jneen.net/ | 2017-06-26 | 1 | -11/+11 |
| | | | | | | | | |||||
| | | * | | | | | rm use of deprecated webmock api in bamboo_service_spec | http://jneen.net/ | 2017-06-26 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | remove use of deprecated webmock feature in jira specs | http://jneen.net/ | 2017-06-26 | 1 | -7/+7 |
| | | | | | | | | |||||
| | | * | | | | | ruby 2.4 compat: update to webmock 2.3.2 | http://jneen.net/ | 2017-06-26 | 2 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'cherry-pick-ecd49e82' into 'master' | Clement Ho | 2017-06-27 | 31 | -34/+234 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates for 9.3 See merge request !12461 | ||||
| | | * | | | | | | Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82 | Clement Ho | 2017-06-26 | 31 | -34/+234 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates for 9.3 See merge request !12041 | ||||
| | * | | | | | | | Merge branch 'cherry-pick-91c122d5' into 'master' | Clement Ho | 2017-06-27 | 1 | -49/+59 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12462 | ||||
| | | * | | | | | | | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5 | Clement Ho | 2017-06-26 | 1 | -49/+59 |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12042 | ||||
| | * | | | | | | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵ | Robert Speicher | 2017-06-27 | 3 | -7/+19 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443 | ||||
| | | * | | | | | | | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nil | Ruben Davila | 2017-06-26 | 3 | -7/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'bpj-pipeline-schedules-form-bundle-refactor' into 'master' | Phil Hughes | 2017-06-27 | 4 | -156/+176 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slightly refactor pipeline schedules form in preparation for additions See merge request !12134 | ||||
| | | * | | | | | | | | Slightly refactor pipeline schedules form in preparation for additions | Bryce Johnson | 2017-06-27 | 4 | -156/+176 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'dz-refactor-group-members-tests' into 'master' | Douwe Maan | 2017-06-27 | 10 | -139/+146 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor group members tests See merge request !12465 | ||||
| | | * | | | | | | | | Move another group member spec from spinachdz-refactor-group-members-tests | Dmitriy Zaporozhets | 2017-06-26 | 2 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | | * | | | | | | | | Fix leave_group_spec.rb | Dmitriy Zaporozhets | 2017-06-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | | * | | | | | | | | Move "remove group member" spec from spinach to rspec | Dmitriy Zaporozhets | 2017-06-26 | 3 | -75/+92 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |