Robert Speicher aefb8a1741 Merge branch 'update-gemoji' into 'master' ...

Add lib/gitlab/emoji.rb instead of gitlab_emoji gem and upgrade Gemojione

- No reason to split it into a separate gem when the gem barely did anything. We can use gemojione directly, making updating gemojione that much easier. Unless there's a particularly good reason we were using the gem?
- Fixes the Rake task since it broke after all the AwardEmoji changes.
- Update gemojione to 2.6.1.

Spring Update changes! http://emojione.com/releases/#2.2.0

See merge request !4919

2016-07-05 17:08:35 +00:00

..

auth

Fix tests

2016-06-06 17:40:26 +02:00

backend

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

badge

Extend build status badge, add html/markdown methods

2016-04-06 19:56:34 +02:00

bitbucket_import

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

ci

Add minor improvements in readability in CI config

2016-07-04 18:36:06 +02:00

database

Fix update_column_in_batches to update all rows

2016-06-17 17:50:38 +02:00

diff

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

email

Limit push email diff size

2016-06-17 08:55:05 +01:00

fogbugz_import

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

gfm

Remove reduntant move_to_store override

2016-03-30 12:50:19 +02:00

git

Handle custom Git hook result in GitLab UI

2016-07-04 20:16:55 +03:00

github_import

Import from Github using Personal Access Tokens.

2016-06-30 18:48:17 +02:00

gitlab_import

adding notifications stuff and more refactoring for exporting projects

2016-06-14 16:31:03 +02:00

gitorious_import

Fixed Rubocop offenses

2015-12-15 00:53:52 -02:00

google_code_import

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

graphs

Refactor commits graph

2014-09-29 12:05:17 +03:00

import_export

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

ldap

Enable Style/EmptyLinesAroundAccessModifier rubocop cop

2016-06-03 10:34:20 +02:00

lfs

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

markdown

Prevent circular reference error in Banzai

2016-01-14 11:30:28 +01:00

metrics

RailsCache metrics now includes fetch_hit/fetch_miss and read_hit/read_miss info.

2016-07-05 12:28:06 +02:00

middleware

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

o_auth

Merge branch 'master' into dev-master

2016-07-02 22:58:21 +02:00

saml

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

sanitizers

Refactored SVG sanitizer

2016-06-12 21:05:58 -04:00

sherlock

Added total query time to Sherlock

2015-11-24 10:57:21 +01:00

sidekiq_middleware

better debugging for memory killer middleware

2016-06-27 12:11:01 +02:00

sql

Fix UNION syntax for MySQL

2015-11-18 13:31:18 +01:00

template

fixup! override content method

2016-06-20 14:48:28 -05:00

access.rb

Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member

2016-06-18 06:06:34 +02:00

akismet_helper.rb

Use ActionDispatch Remote IP for Akismet checking

2016-04-27 22:12:55 -07:00

app_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

asciidoc.rb

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

auth.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

award_emoji.rb

Fix emoji paths in relative root configurations

2016-07-01 09:10:12 -07:00

bitbucket_import.rb

Fix specs.

2015-02-24 15:07:24 +01:00

blame.rb

add custom highlighting via .gitattributes

2016-06-27 14:17:49 -07:00

build_data_builder.rb

Try to use pipeline where applicable

2016-06-03 13:09:49 +02:00

closing_issue_extractor.rb

Allow invalid URLs in closing pattern

2015-12-02 18:48:39 +01:00

color_schemes.rb

Add count to Themes and ColorSchemes

2015-08-26 11:30:38 -07:00

config_helper.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

contributions_calendar.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

contributor.rb

Move lib/gitlab/contributors to its correct path

2015-04-09 15:34:55 -04:00

current_settings.rb

Handle case when Redis cache returns an empty setting

2016-06-29 14:28:41 -07:00

database.rb

Fix RangeError exceptions when referring to issues or merge requests outside of max database values

2016-06-18 13:07:38 -07:00

devise_failure.rb

Use a custom Devise failure app to handle unauthenticated .zip requests

2016-03-08 23:49:30 -05:00

emoji.rb

Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.

2016-06-29 14:53:09 -06:00

exclusive_lease.rb

clean up ExclusiveLease

2016-04-13 13:12:05 +03:00

force_push_check.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

git_access_status.rb

Rubocop enabled for: Use spaces inside hash literal braces

2015-02-02 20:36:54 -08:00

git_access_wiki.rb

Rename abilities to correspond contoller/model action names

2015-06-26 15:55:56 +02:00

git_access.rb

Improve multiple branch push performance by memoizing permission checking

2016-05-09 01:17:14 -07:00

git_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

git_post_receive.rb

Back-porting PostReceive refactor made for EE 🍺

2016-03-17 00:24:12 -03:00

git_ref_validator.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

git.rb

Freeze the expression instead of the literal

2016-02-05 08:39:44 +01:00

gitorious_import.rb

Define GITORIOUS_HOST only once

2015-06-10 01:31:27 -04:00

gl_id.rb

Revert "squashed merge and fixed conflicts"

2016-06-16 12:59:07 +02:00

gon_helper.rb

Unused got variable with very bad performance

2016-06-28 17:01:37 +02:00

highlight.rb

support cgi style options, such as erb?parent=json

2016-06-27 14:17:49 -07:00

identifier.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

import_export.rb

bump version - as old exports wont be compatible

2016-06-29 10:49:31 +02:00

import_formatter.rb

Fix bug where only the first 15 Bitbucket issues would be imported.

2015-09-01 08:50:20 -07:00

import_sources.rb

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

incoming_email.rb

Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature

2016-03-25 13:05:15 +01:00

issues_labels.rb

remove feature label

2014-10-31 17:22:16 -07:00

key_fingerprint.rb

Enable Style/UnneededCapitalW Rubocop cop

2016-06-30 13:31:52 +02:00

lazy.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

markup_helper.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

metrics.rb

Fix setting of "action" for Grape transactions

2016-04-20 22:42:52 +02:00

note_data_builder.rb

Refactor and expose only Gitlab::UrlBuilder.build(record)

2016-04-13 16:07:04 +02:00

other_markup.rb

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

popen.rb

Style/RedundantReturn enabled

2015-03-24 18:35:57 -07:00

production_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

project_search_results.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

push_data_builder.rb

API support for the 'since' and 'until' operators on commit requests

2016-04-29 09:26:52 +02:00

recaptcha.rb

reCAPTCHA is configurable through Admin Settings, no reload needed.

2015-12-28 18:50:29 -02:00

redis.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

reference_extractor.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

regex.rb

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

repository_check_logger.rb

Rename almost all the things

2016-04-06 13:47:05 +02:00

routing.rb

Added & use Gitlab::Routing for URL helpers

2016-04-01 11:13:48 +02:00

search_results.rb

Restrict access to confidential issues on search results

2016-03-17 20:55:59 -03:00

seeder.rb

Replace colorize gem with rainbow.

2016-06-03 10:37:09 -06:00

sherlock.rb

Only load rblineprof when actually needed

2015-11-09 15:54:13 +01:00

sidekiq_logger.rb

Dry admin logs.

2014-10-06 00:14:46 +02:00

snippet_search_results.rb

Refactor Gitlab::SnippetSearchResults

2016-03-11 15:25:22 -05:00

themes.rb

Add count to Themes and ColorSchemes

2015-08-26 11:30:38 -07:00

upgrader.rb

Replace all usages of git command with configurable binary path

2015-11-03 17:11:09 -05:00

uploads_transfer.rb

Fix: Images cannot show when projects' path was changed

2015-10-14 18:50:35 +03:00

url_builder.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

url_sanitizer.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

user_access.rb

Move method to User

2016-03-10 12:37:14 +01:00

utils.rb

add common method to force utf8 and force oauth properties to be utf8

2015-05-03 00:43:46 +03:00

version_info.rb

Fix abort gitlab:app:check

2013-06-06 10:10:51 +09:00

visibility_level.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

workhorse.rb

Bump workhorse version

2016-06-28 22:10:53 +02:00