delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix/status-of-pipeline-without-builds' into 'master'	Rémy Coutable	2016-06-16	9	-73/+146
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve pipeline status in case that pipeline has no jobs ## What does this MR do? This MR resolves problem with pipeline status when there are no build in pipeline. This can happen when builds were skipped - for example - by using `only`/`except` keyword in `.gitlab-ci.yml`. ## What are the relevant issue numbers? Closes #17977 See merge request !4403
\| *	Merge branch 'master' into fix/status-of-pipeline-without-buildsfix/status-of-pipeline-without-builds	Grzegorz Bizon	2016-06-15	290	-2246/+6397
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (198 commits) Set inverse_of for Project/Services relation Fix admin hooks spec Prevent default disabled buttons and links. Add index on `requested_at` to the `members` table Rearrange order of tabs Fix admin active tab tests Show created_at in table column Nest li elements directly under ul Move builds tab to admin overview Add monitoring link with subtabs Add sub links to overview Add counter for abuse reports Remove admin layout-nav counters Move admin nav to horizontal layout nav Eager load project relations in IssueParser Use validate and required for environment and project Award Emoji can't be awarded on system notes backend Get rid of Gitlab::ShellEnv Update CHANGELOG. Fix project star tooltip on the fly. ... Conflicts: app/services/ci/create_builds_service.rb
\| * \|	Remove reduntant method for building pipeline builds	Grzegorz Bizon	2016-06-15	5	-9/+12
\| \| \|
\| * \|	Add Changelog entry for pipeline status fix	Grzegorz Bizon	2016-06-15	1	-0/+1
\| \| \|
\| * \|	Improve creating builds by combining two loops	Grzegorz Bizon	2016-06-15	1	-20/+16
\| \| \|
\| * \|	Add note for short circuit eval when building builds	Grzegorz Bizon	2016-06-15	1	-2/+12
\| \| \|
\| * \|	Return false in create_builds if not builds created	Grzegorz Bizon	2016-06-15	2	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \|	This fixes compatibility with trigger request create service.
\| * \|	Improve code clarity in pipeline create service	Grzegorz Bizon	2016-06-14	3	-17/+41
\| \| \|
\| * \|	Remove ci commit specs that remain after bad merge	Grzegorz Bizon	2016-06-14	1	-403/+0
\| \| \|
\| * \|	Merge branch 'master' into fix/status-of-pipeline-without-builds	Grzegorz Bizon	2016-06-14	914	-4415/+14121
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (538 commits) Fix broken URI joining for `teamcity_url` with suffixes Factorize duplicated code into a method in BambooService and update specs Fix broken URI joining for `bamboo_url` with suffixes Honor credentials on calling Bamboo CI trigger Update CHANGELOG Use Issue.visible_to_user in Notes.search to avoid query duplication Project members with guest role can't access confidential issues Allow users to create confidential issues in private projects Update CHANGELOG Remove deprecated issues_tracker and issues_tracker_id from project Schema doesn’t reflect the changes of the last 3 migrations Apply reviewer notes: update CHANGELOG, adjust code formatting Move issue rendering tests into separate contexts Move change description to proper release and fix typo Add more information into RSS fead for issues Revert CHANGELOG Also rename "find" in the specs Change to new Notes styleguide Add guide on changing a document's location Change logs.md location in README ... Conflicts: app/services/ci/create_builds_service.rb app/services/ci/create_pipeline_service.rb app/services/create_commit_builds_service.rb spec/models/ci/commit_spec.rb spec/services/ci/create_builds_service_spec.rb spec/services/create_commit_builds_service_spec.rb
\| * \| \|	Refactor code reponsible for creating builds	Grzegorz Bizon	2016-06-03	7	-25/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes duplications and extracts method that builds build-jobs without persisting those objects, to a separate method.
\| * \| \|	Fix specs for pipeline create for merge requests	Grzegorz Bizon	2016-06-03	1	-1/+4
\| \| \| \|
\| * \| \|	Update specs describe	Kamil Trzcinski	2016-06-03	1	-1/+1
\| \| \| \|
\| * \| \|	Update CreateCommitBuildsService to pass tests	Kamil Trzcinski	2016-06-03	4	-25/+27
\| \| \| \|
\| * \| \|	Save Ci::Commit object to persist all created builds	Kamil Trzcinski	2016-06-03	6	-6/+21
\| \| \| \|
\| * \| \|	Do not create pipeline objects when no builds	Grzegorz Bizon	2016-06-03	3	-23/+34
\| \| \| \|
\| * \| \|	Update ci commit pipeline specs according to changes	Grzegorz Bizon	2016-06-03	2	-9/+9
\| \| \| \|
\| * \| \|	Add minor improvements in create builds service	Grzegorz Bizon	2016-06-03	4	-10/+8
\| \| \| \|
\| * \| \|	Add specs covering case when there are no builds	Grzegorz Bizon	2016-06-03	1	-0/+18
\| \| \| \|
\| * \| \|	Refactor ci commit pipeline to prevent implicit saves	Grzegorz Bizon	2016-06-03	4	-27/+17
\| \| \| \|
* \| \| \|	Merge branch '18591-banzai-filter-upload-link-filter' into 'master'	Yorick Peterse	2016-06-16	3	-10/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Banzai::Filter::UploadLinkFilter use XPath See merge request !4703
\| * \| \| \|	Banzai::Filter::UploadLinkFilter use XPath	Paco Guzman	2016-06-16	3	-10/+22
\| \| \| \| \|
* \| \| \| \|	Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master'	Douwe Maan	2016-06-16	5	-26/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460) ## What does this MR do? It improves the check we use to display or not the members' access and controls in the members list. ## Are there points in the code the reviewer needs to double check? No, I replaced an helper with just a permission check so I think it's a better solution. ## Why was this MR needed? There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - No CHANGELOG needed - [x] Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4670
\| * \| \| \| \|	Fix permission checks in member rowbackport-view-condition-improvement-from-ee-460	Rémy Coutable	2016-06-15	3	-24/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Fix wrong partial path in JS view	Rémy Coutable	2016-06-15	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'group-owners-association' into 'master'	Rémy Coutable	2016-06-16	2	-4/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turn Group#owners into a has_many association ## What does this MR do? This turns the regular method `Group#owners` into a `has_many` association. ## Are there points in the code the reviewer needs to double check? As far as I can tell there's no way to do this without using an intermediate association, but perhaps I'm missing something. The reason an intermediate association is needed is because the supplied Proc is applied to the _final_ association (the one returning users), this means that when using a single `has_many` you can't filter out any intermediate rows (e.g. group members). ## Why was this MR needed? This code being a regular method would prevent eager loading of the owners of a Group, turning it into a `has_many` association resolves this problem. This was discovered in !4410. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - [ ] Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4676
\| * \| \| \| \| \|	Turn Group#owners into a has_many association	Yorick Peterse	2016-06-16	2	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the owners to be eager loaded where needed.
* \| \| \| \| \| \|	Merge branch 'fix-environments-db' into 'master'	Valery Sizov	2016-06-16	2	-1/+22
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make project_id nullable ## What does this MR do? Fixes the broken migration which is not in sync with `db/schema.rb`. It's to solve https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/469. See merge request !4701
\| * \| \| \| \| \|	Make project_id nullable	Kamil Trzcinski	2016-06-16	2	-1/+22
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix_migration_style_guide' into 'master'	Yorick Peterse	2016-06-16	1	-2/+14
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update migration_style_guide.md with new details See merge request !4693
\| * \| \| \| \| \|	Update migration_style_guide.md with new detailsfix_migration_style_guide	Drew Blessing	2016-06-15	1	-2/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'hide-todo-collapsed-sidebar' into 'master'	Jacob Schatz	2016-06-16	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide the Todo button in the collapsed issuable sidebar. ## What does this MR do? Fixes a bug where the "Add Todo" button was displayed in the collapsed sidebar. ## Are there points in the code the reviewer needs to double check? This shouldn't remove any other elements from the collapsed sidebar. ## What are the relevant issue numbers? None ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-15_at_11.41.46_AM](/uploads/27a1ace58cf8c44ad96accd3d0b32f11/Screen_Shot_2016-06-15_at_11.41.46_AM.png) After: ![Screen_Shot_2016-06-15_at_11.40.53_AM](/uploads/91a8585680fc482682d0efafdba4d599/Screen_Shot_2016-06-15_at_11.40.53_AM.png) See merge request !4686
\| * \| \| \| \| \| \|	Hide the Todo button in the collapsed issuable sidebar.hide-todo-collapsed-sidebar	Connor Shea	2016-06-15	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'long-commit-message-scroll-fix' into 'master'	Jacob Schatz	2016-06-16	2	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix long commit message scroll issue. Fixes horizontal scrollbar for long commit description. ## Before ![before_](/uploads/d261e26044d8ab451bc7768b16316253/before_.png) ## After ![after](/uploads/f27227a77d25d80b797e3ffc916d1957/after.png) See merge request !4643
\| * \ \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2016-06-16	353	-2724/+15578
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	long-commit-message-scroll-fix
\| * \| \| \| \| \| \| \| \|	Update CHANGELOG.long-commit-message-scroll-fix	Fatih Acet	2016-06-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix long commit message scroll issue.	Fatih Acet	2016-06-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18481.
* \| \| \| \| \| \| \| \| \|	Merge branch 'category-search-dropdown' into 'master'	Jacob Schatz	2016-06-16	10	-22/+354
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show categorised search queries in the search autocomplete Fixes #5885 It works in 3 categories, Dashboard, Groups and Project. ## Dashboard context ![for-dashboard](/uploads/3a59f6ec008a972495597c8f2691c385/for-dashboard.png) ## Group context ![for-group](/uploads/f7aa413d56330a1d9b2e5562f95badf7/for-group.png) ## Project context ![for-project](/uploads/dabe04cf8758a056cf7b03da001ffd91/for-project.png) ## Screencast ![category-search-dropdown](/uploads/4d9513dcd6ccb6e24adefdf65f9bc778/category-search-dropdown.gif) See merge request !4499
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2016-06-16	367	-2845/+15729
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	category-search-dropdown # Conflicts: # app/assets/javascripts/lib/common_utils.js.coffee
* \| \| \| \| \| \| \| \| \|	Merge branch 'toggle-whitespace-button-for-compare-page' into 'master'	Jacob Schatz	2016-06-15	3	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Toggle whitespace button for compare page ## What does this MR do? Adds whitespace button to compare branches page. ## Are there points in the code the reviewer needs to double check? Ruby code. ## Why was this MR needed? Compare branches UX ## What are the relevant issue numbers? Closes #17881. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4569
\| * \| \| \| \| \| \| \| \| \|	added whitespace toggle to diffs page and set it to return the project ↵	Luke "Jared" Bennett	2016-06-10	3	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'award-emoji-fix' into 'master'	Jacob Schatz	2016-06-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix emoji block selector. Fixes #18465 and #18577 See merge request !4604
\| * \| \| \| \| \| \| \| \| \| \|	Fix emoji block selector.award-emoji-fix	Fatih Acet	2016-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-changelog' into 'master'	Robert Speicher	2016-06-15	1	-0/+24
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG [ci skip] See merge request !4695
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.7.7 release	Douglas Barbosa Alexandre	2016-06-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.6.9 release	Douglas Barbosa Alexandre	2016-06-15	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.5.13 release	Douglas Barbosa Alexandre	2016-06-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.4.11 release	Douglas Barbosa Alexandre	2016-06-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.3.10 release	Douglas Barbosa Alexandre	2016-06-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG for 8.2.6 release8-2-6-changelog-entries	Douglas Barbosa Alexandre	2016-06-15	1	-0/+4
\| \| \|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]