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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Mask owner email when updated.	Douwe Maan	2015-04-03	1	-14/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow projects to be imported from Google Code.	Douwe Maan	2015-04-03	4	-0/+429
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ldap_migration'	Dmitriy Zaporozhets	2015-04-13	2	-3/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: db/schema.rb
\| * \| \| \| \| \| \| \| \|	Remove special cases for the 'ldap' provider	Jacob Vosmaer	2015-04-13	2	-3/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'reference-access-control' into 'master'	Dmitriy Zaporozhets	2015-04-13	3	-65/+66
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742
\| * \| \| \| \| \| \| \| \| \|	Refactor ClosingIssueExtractor.	Douwe Maan	2015-04-03	1	-12/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor ReferenceExtractor.	Douwe Maan	2015-04-03	1	-29/+28
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't require user to every gfm call.	Douwe Maan	2015-04-03	1	-21/+21
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix errors.	Douwe Maan	2015-04-02	2	-20/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Only allow users to cross-reference and close issues they have access to.	Douwe Maan	2015-04-02	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't allow full access to guests in ReferenceExtractor	Douwe Maan	2015-04-02	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor Mentionable mentioned users to use ReferenceExtractor.	Douwe Maan	2015-04-02	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Only allow user to reference objects they have access to.	Douwe Maan	2015-04-02	2	-21/+31
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Slightly refactor ReferenceExtractor.	Douwe Maan	2015-04-02	2	-38/+38
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'skip-email-reconfirmation' into 'master'	Dmitriy Zaporozhets	2015-04-13	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skip email confirmation when set by admin or via LDAP. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203. See merge request !494
\| * \| \| \| \| \| \| \| \| \| \|	Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmation	Douwe Maan	2015-04-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'shell-version-warning' into 'master'	Dmitriy Zaporozhets	2015-04-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warn when gitlab-shell version doesn't match requirement. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1791. See merge request !495
\| * \| \| \| \| \| \| \| \| \| \| \|	Warn when gitlab-shell version doesn't match requirement.shell-version-warning	Douwe Maan	2015-04-06	1	-1/+1
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #9114 from dreis2211/dreis2211-patch-1	Dmitriy Zaporozhets	2015-04-10	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Include creator_id in project info of API
\| * \| \| \| \| \| \| \| \| \| \|	Include creator_id in project info of API	Christoph Dreis	2015-04-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-revert-preload-lib' into 'master'	Dmitriy Zaporozhets	2015-04-10	6	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Preload lib/" This reverts commit 5511a731bcc05034abacd4ec01ff7d5a2a3b89d3. The original commit added this because it also enabled threadsafety, a change which was itself later reverted in 66d6c809662980041fce66d182489c025475e7a7, but this got left behind. I don't fully understand the reasoning behind it so if I'm wrong, please tell me. My reasoning for reverting it is that it messes with Rails' (and by extension Spring's) class reloading during development. When I was working in `lib/gitlab/markdown` and had to stop and restart the server every time I made a change, I didn't know it at the time, but this was why. That was a huge pain point. If it's needed for production perhaps we could add a `if Rails.env.production?` clause around it so that it doesn't mess with development. See merge request !1758
\| * \| \| \| \| \| \| \| \| \| \| \|	Move lib/gitlab/contributors to its correct path	Robert Speicher	2015-04-09	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add autoloads for lib/gitlab/satellite/files/*	Robert Speicher	2015-04-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These files don't match their naming convention, but for organizational purposes it makes sense.
\| * \| \| \| \| \| \| \| \| \| \| \|	Add lib/gitlab.rb to autoload non-conventional paths	Robert Speicher	2015-04-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Move lib/gitlab/oauth to lib/gitlab/o_auth	Robert Speicher	2015-04-09	3	-1/+1
\| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lets Rails autoload these files by name
* \| \| \| \| \| \| \| \| \| \| \|	Be more explicit about which "Markdown" ReferenceExtractor includes	Robert Speicher	2015-04-09	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Use Projects::CreateService to create imported projects so hooks are executed.	Douwe Maan	2015-04-06	4	-64/+12
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'feature_expose_project_labels' into 'master'	Hannes Rosenögger	2015-04-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exposing Project Labels in the REST API The intent here is to expose the tag_list property of the Project entity over the REST API so that any project searches include the information. The specific reason I've implemented this change is for an environment in which multiple gitlab servers exist, where a central portal to the projects that are spread around the network will be useful. Having access to filtering on this fairly large project list based on their labels, will be of great use. This satisfies the feature request http://feedback.gitlab.com/forums/176466-general/suggestions/6325819-project-labels-via-api The change was made in the `lib/api/entities.rb` file. The output of a `GET` to something like `/projects` or `/projects/7` is now: ```javascript { "id": 7, "description": "Veritatis est eaque voluptas magni expedita.", "default_branch": "master", "tag_list": [ "typeahead", "twitter" ], "public": false, "archived": false, "visibility_level": 0, ... } ``` See merge request !329
\| * \| \| \| \| \| \| \| \|	Modified lib/api/entities.rb to expose Project class tag_list property to ↵	Cristian Medina	2015-04-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the API Updated projects.md to show tag_list field when performing GETs Updated projects_spec.rb to include check for tag_list key in project list Added changes to the CHANGELOG
* \| \| \| \| \| \| \| \| \|	Merge branch 'configurable-attachment-size' into 'master'	Douwe Maan	2015-04-03	2	-3/+12
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support configurable attachment size in Application Settings page ### What does this MR do? This MR provides the ability to configure the maximum size of an attachment inside a note. A parameter has been added to the Application Settings page. ### Are there points in the code the reviewer needs to double check? What should be done with the legacy note attachment validation? I added code to make the validation work with the configurable setting. I could see an issue where an admin lowers the limit from 10 megabytes to 5 megabytes, which could cause an existing model to be invalid. ### Why was this MR needed? We often have attachments that exceed 10 MB, and it would be nice to be able to override the defaults. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? See Issue #1258 ### Screenshots Before: ![Screen_Shot_2015-03-29_at_3.06.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6013a1dbc8cf61a63e93744149937fa0/Screen_Shot_2015-03-29_at_3.06.53_PM.png) After: ![Screen_Shot_2015-03-29_at_3.12.34_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f3518af7e8653ba40f0a3579456da6ad/Screen_Shot_2015-03-29_at_3.12.34_PM.png) See merge request !407
\| * \| \| \| \| \| \| \| \|	Support configurable attachment size via Application Settings	Stan Hu	2015-04-02	2	-3/+12
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* \| \| \| \| \| \| \| \|	Merge branch 'import-current-user' into 'master'	Dmitriy Zaporozhets	2015-04-02	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace. Addresses #1347. Untested since I'm in a bit of a hurry. Will definitely have time to test and add unit tests before the 7.10 release :) See merge request !481
\| * \| \| \| \| \| \| \| \|	Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user ↵	Douwe Maan	2015-03-31	1	-0/+4
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into current namespace.
* \| \| \| \| \| \| \| \|	Merge branch 'repository-archive-worker' into 'master'	Dmitriy Zaporozhets	2015-04-02	1	-5/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Archive repositories in background worker. Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/17 being merged, a new `gitlab_git` being released and this MR's `Gemfile.lock` being updated.. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2173. To do after this is merged: Update https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb in omnibus. See merge request !436
\| * \| \| \| \| \| \| \| \|	Archive repositories in background worker.	Douwe Maan	2015-03-31	1	-5/+6
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'username-period' into 'master'	Dmitriy Zaporozhets	2015-04-02	3	-32/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't allow username to end in period. The current behavior doesn't do username referencing and mentioning in sentences like "I discussed with with @douwe." since `douwe.` is matched as a username. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2174. See merge request !438
\| * \| \| \| \| \| \| \| \|	Don't allow username to end in period.	Douwe Maan	2015-03-27	2	-3/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use more specific regexes.	Douwe Maan	2015-03-27	1	-30/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move User.cleanup_username to Namespace.cleanup_path.	Douwe Maan	2015-03-27	1	-1/+1
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	ability to skip some items in backupbackup_skip_option	Valery Sizov	2015-04-02	2	-15/+60
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2015-03-31	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'no-chmod-r' into 'master'	Dmitriy Zaporozhets	2015-04-01	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use chmod_R for backup tars When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents. See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1716#note_40472 See merge request !1744
\| \| * \| \| \| \| \| \| \|	Don't use chmod_R for backup tars	Vinnie Okada	2015-03-28	1	-1/+1
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When creating backup tar files, only change permissions on the `db`, `uploads`, and `repositories` directories, not their contents.
* \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-03-31	2	-16/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/gitlab/markdown.rb
\| * \ \ \ \ \ \ \ \	Merge branch 'group-information-leak' into 'master'	Dmitriy Zaporozhets	2015-04-01	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't leak private group existence by redirecting from namespace controller to group controller. See merge request !440
\| \| * \| \| \| \| \| \| \|	Don't leak private group existence by redirecting from namespace controller ↵	Douwe Maan	2015-03-24	1	-1/+1
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to group controller.
\| * \| \| \| \| \| \| \|	Merge pull request #9023 from dantudor/patch-1	Dmitriy Zaporozhets	2015-03-31	1	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|	Allow ability to delete branches with '/` in name
\| \| * \| \| \| \| \| \|	Added the missing comma	Dan Tudor	2015-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Allow ability to delete branches with '/` in name	Dan Tudor	2015-03-25	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'email-full-url'	Marin Jankovski	2015-03-31	1	-37/+53
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|