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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Merge branch 'master' into mc-ui	Douwe Maan	2016-08-15	1	-1/+4
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove undo endpoint	Sean McGivern	2016-08-12	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
\| * \| \| \| \| \| \| \|	REMOVE THIS COMMIT: allow undoing last resolution	Sean McGivern	2016-08-12	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow resolving conflicts in MR controller	Sean McGivern	2016-08-12	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added routes for conflicts in merge requests page.	Fatih Acet	2016-08-12	1	-0/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Annabel Dunstone	2016-08-16	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	18681-pipelines-merge-request
\| * \| \| \| \| \| \|	Load issues and merge requests templates from repository	Felipe Artur	2016-08-16	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2016-08-16	16	-125/+233
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	18681-pipelines-merge-request
\| * \| \| \| \| \| \|	Merge branch 'akismet-submittable' into 'master'	Robert Speicher	2016-08-15	1	-1/+6
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Submit to Akismet Part 1 (Issues) Related to #5932 #5573 gitlab-com/infrastructure#14 See merge request !5538
\| \| * \| \| \| \| \|	Allow `Issue` to be submitted as spam	Patricio Cano	2016-08-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added controller actions as reusable concerns - Added controller tests
\| \| * \| \| \| \| \|	Allow `SpamLog` to be submitted as ham	Patricio Cano	2016-08-15	1	-1/+5
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added `submitted_as_ham` to `SpamLog` to mark which logs have been submitted to Akismet. - Added routes and controller action.
\| * \| \| \| \| \|	Add coverage report badge metadata class	Grzegorz Bizon	2016-08-15	1	-1/+4
\| \|/ / / / /
\| * \| \| \| \|	Instrument Project.visible_to_user	Yorick Peterse	2016-08-12	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because this method is a Rails scope we have to instrument it manually as regular the instrumentation methods only instrument methods defined directly on a Class or Module.
\| * \| \| \| \|	Merge branch '15000-rename-markdown-preview' into 'master'	Robert Speicher	2016-08-11	1	-2/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename `markdown_preview` routes to `preview_markdown` _Originally opened at !3700 by @cbartz._ Closes #15000. See merge request !5774
\| \| * \| \| \| \|	Rename `markdown_preview` routes to `preview_markdown`	Christopher Bartz	2016-08-11	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'remove-grack-lfs' into 'master'	Rémy Coutable	2016-08-11	3	-7/+23
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Grack::Auth: part 2 (LFS) Deprecate Grack::Auth and handle LFS in Rails controllers under the Project namespace. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14501 See merge request !5369
\| \| * \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Jacob Vosmaer	2016-08-09	9	-37/+78
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove-grack-lfs
\| \| * \| \| \| \| \|	Handle custom Git LFS content type	Jacob Vosmaer	2016-07-22	1	-0/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove obsolete code	Jacob Vosmaer	2016-07-22	1	-3/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add LFS controllers	Jacob Vosmaer	2016-07-22	1	-4/+16
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'decouple-secret-keys' into 'master'	Douwe Maan	2016-08-10	1	-33/+70
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store OTP secret key in secrets.yml ## What does this MR do? Migrate the value of `.secret` to `config/secrets.yml` if present, so that `.secret` can be rotated without preventing all users with 2FA from logging in. (On a clean setup, generate different keys for each.) ## Are there points in the code the reviewer needs to double check? I'm not sure we actually need `.secret` at all after this, but it seems safer not to touch it. ## Why was this MR needed? We have some DB encryption keys in `config/secrets.yml`, and one in `.secret`. They should all be in the same place. ## What are the relevant issue numbers? #3963, which isn't closed until I make the relevant changes in Omnibus too. ## 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) - ~~API support added~~ - Tests - [x] Added for this feature/bug - [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 !5274
\| \| * \| \| \| \| \|	Ignore Rails/Exit cop in initializer	Sean McGivern	2016-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We do not want to proceed with loading the app in this case, as it could lose a secret needed to decrypt values in the database.
\| \| * \| \| \| \| \|	Clarify intentions of secret token initializer	Sean McGivern	2016-08-03	1	-35/+55
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Give priority to environment variables	Sean McGivern	2016-08-03	1	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If an environment variable exists for secret_key_base, use that - always. But don't save it to secrets.yml. Also ensure that we never write to secrets.yml if there's a non-blank value there.
\| \| * \| \| \| \| \|	Store all secret keys in secrets.yml	Sean McGivern	2016-08-03	1	-24/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the last secret from .secret to config/secrets.yml, and delete .secret if it exists.
\| \| * \| \| \| \| \|	Store OTP secret key in secrets.yml	Sean McGivern	2016-08-03	1	-36/+45
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.secret stores the secret token used for both encrypting login cookies and for encrypting stored OTP secrets. We can't rotate this, because that would invalidate all existing OTP secrets. If the secret token is present in the .secret file or an environment variable, save it as otp_key_base in secrets.yml. Now .secret can be rotated without invalidating OTP secrets. If the secret token isn't present (initial setup), then just generate a separate otp_key_base and save in secrets.yml. Update the docs to reflect that secrets.yml needs to be retained past upgrades, but .secret doesn't.
\| * \| \| \| \| \|	Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'	Douwe Maan	2016-08-09	5	-46/+62
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/redis.rb
\| \| * \| \| \| \|	Added Redis Sentinel support documentation	Gabriel Mazetto	2016-08-04	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Synced mail_room.yml with the one in omnibus	Gabriel Mazetto	2016-08-04	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a comment to remember developers to open merge request to omnibus in future changes of the file.
\| \| * \| \| \| \|	Few minor fixes to Redis params order and commented out sentinel config	Gabriel Mazetto	2016-08-04	1	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in resque.yml.example Codestyle changes
\| \| * \| \| \| \|	Fixed specs for Gitlab::Redis and code for Redis Sentinel support	Gabriel Mazetto	2016-08-04	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Make sidekiq get config settings from Gitlab::RedisConfig	Gabriel Mazetto	2016-08-04	1	-8/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Deduplicated resque.yml loading from several places	Gabriel Mazetto	2016-08-04	4	-38/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We will trust redis configuration params loading to Gitlab::RedisConfig.
\| * \| \| \| \| \|	Update to send changed password notification emails	Tom Bell	2016-08-05	1	-0/+3
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the devise initializer config setting to enable the sending of notification emails when a user changes their password.
\| * \| \| \| \|	Merge branch 'fix/ha-mode-import-issue' into 'master'	Rémy Coutable	2016-08-04	1	-3/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Import/Export not working in HA mode Use a shared path instead of `Tempfile` default `/tmp` so the import file is accessible by any GitLab instance. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20506 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 !5618
\| \| * \| \| \| \|	using shared path for project import uploads and refactored gitlab remove ↵	James Lopez	2016-08-04	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	export worker
\| * \| \| \| \| \|	Instrument Gitlab::Highlightinstrument-gitlab-highlight	Yorick Peterse	2016-08-03	1	-0/+3
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This class does quite a few interesting things so let's instrument it so we can see how much time is being spent in this class.
\| * \| \| \| \|	Merge branch 'branches-ending-with-json' into 'master'	Douwe Maan	2016-08-02	1	-7/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow branch names ending with .json for graph and network page ## What does this MR do? Allow branch names to end with `.json` for graph and network page. ## Why was this MR needed? Displaying branches ending on `.json` in repository view crashes because links to graph and network page can not be determined. ## What are the relevant issue numbers? fixes #20462, #19585 See merge request !5579
\| \| * \| \| \| \|	Allow branch names ending with .json for graph and network page (!5579)	winniehell	2016-08-02	1	-7/+11
\| \| \|/ / / /
\| * \| \| \| \|	Instrument the Repository classinstrument-repository-class	Yorick Peterse	2016-08-02	1	-0/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since this isn't an ActiveRecord::Base descendant it wasn't instrumented.
\| * \| \| \|	Fix RequestProfiler::Middleware error when code is reloaded in developmentfix/request-profiler-middleware-error-on-reload	Ahmad Sherif	2016-08-01	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #20452
\| * \| \| \|	Merge branch 'zj-env-external-url' into 'master'	Rémy Coutable	2016-08-01	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an URL field to Enviroments ## What does this MR do? Adds a field to the `enviroments` table to expose later in other features. Now I see the task list below, I noticed I forgot some minor things, but Ill adress those after the first review. ## Are there points in the code the reviewer needs to double check? The field is a string on the database, thus limited to 255 chars, which seems more than enough. ## What are the relevant issue numbers? Closes #19527 ## Screenshots (if relevant) ![Screen_Shot_2016-07-25_at_15.22.16](/uploads/5c3f39466f8e2114195270006aed20c0/Screen_Shot_2016-07-25_at_15.22.16.png)![Screen_Shot_2016-07-25_at_15.22.53](/uploads/408cf86610137dd4a861d15dcd677a2c/Screen_Shot_2016-07-25_at_15.22.53.png)![Screen_Shot_2016-07-25_at_15.23.10](/uploads/927c506931f4e0338cdbbc58678bd308/Screen_Shot_2016-07-25_at_15.23.10.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - Tests - [x] Added for this feature/bug - [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] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5469
\| \| * \| \| \|	Use Grape DSL for environment endpoints	Z.J. van de Weg	2016-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also a couple of minor edits for this branch are included
\| \| * \| \| \|	Add an URL field to Environments	Z.J. van de Weg	2016-07-29	1	-1/+1
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR adds a string (thus max 255 chars) field to the enviroments table to expose it later in other features.
\| * \| \| \|	Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured.	lookatmike	2016-07-31	1	-0/+2
\| \|/ / /
\| * \| \|	Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-files	Ahmad Sherif	2016-07-27	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch '14584-remove-routes-that-we-do-not-use-anymore' into 'master'	Rémy Coutable	2016-07-27	1	-12/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove routes that we do not use anymore" _Originally opened at !4059 by @strzibny._ - - - ## What does this MR do? > I tried to clean up the routes as mentioned in #14584 I used the following script and manually verified the changes: https://gist.github.com/strzibny/4ccbda7dcf67ef6719dcb047014e1ea7 After this patch, the script still gives me the following routes: Unused routes (7): oauth/authorizations#show doorkeeper/tokens#create doorkeeper/tokens#revoke oauth/applications#edit oauth/applications#show doorkeeper/token_info#show omniauth_callbacks#(?-mix:(?!)) Here is a relevant code from doorkeeper on drawing these routes: https://github.com/doorkeeper-gem/doorkeeper/blob/5ea4575863781940fe6996692c6b41f2ad71d90e/lib/doorkeeper/rails/routes.rb#L25 ## What are the relevant issue numbers? Closes #14584. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 !5499
\| \| * \| \|	Remove useless new route14584-remove-routes-that-we-do-not-use-anymore	Rémy Coutable	2016-07-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \|	Add route for Import::GithubController#new	Rémy Coutable	2016-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \|	Clean up unused routes	Josef Strzibny	2016-07-26	1	-14/+12
\| \| \| \|/ \| \| \|/\|