Commit graph

146 commits

Author SHA1 Message Date
Alex
6e186b76bb Added support for Authentiq oauth provider 2016-12-21 10:51:10 +02:00
Mike Greiling
5cd95549d0 add pipeline succeeded email notification 2016-10-05 23:07:00 -05:00
Mike Greiling
004cd8df16 update pipeline failed email margins 2016-10-05 22:19:53 -05:00
Mike Greiling
0275a6d4fd implement ci notification email template (first pass) 2016-09-22 23:17:41 -05:00
Clement Ho
2fd6472598 Fix markdown anchor icon interaction 2016-09-02 13:55:10 -05:00
Gokmen Goksel
a927a9bf6b Support integration with Koding (online IDE)
Koding: #index: landing page for Koding integration

If enabled it will provide a link to open remote Koding instance url
for now we are also providing the sneak preview video for how
integration works in detail.

Repository: check whether .koding.yml file exists on repository

Projects: landing page: show Run in IDE (Koding) button if repo has stack file

Projects: MR: show Run in IDE Koding button if repo has stack file on active branch

ProjectHelpers: add_koding_stack: stack generator for provided project

With this helper we will auto-generate the required stack template
for a given project. For the feature we can request this base template
from the running Koding instance on integration.

Currently this will provide users to create a t2.nano instance on aws
and it'll automatically configures the instance for basic requirements.

Projects: empty state and landing page provide shortcuts to create stack

projects_helper: use branch on checkout and provide an entry point

This ${var.koding_queryString_branch} will be replaced with the branch
provided in query string which will allow us to use same stack template
for different branches of the same repository.

ref: b8c0e43c4c

projects_helper: provide sha info in query string to use existing vms

With this change we'll be able to query existing vms on Koding side
based on the commit id that they've created.

ref: 1d630fadf3

Integration: Docs: Koding documentation added

Disable /koding route if integration is disabled

Use application settings to enable Koding

Projects_helper: better indentation with strip_heredoc usage

Projects_helper: return koding_url as is if there is no project provided

current_settings: set koding_enabled: false by default

Koding_Controller: to render not_found once integration is disabled

Dashboard_specs: update spec for Koding enabled case

Projects_Helper: make repo dynamic

ref: 4d615242f4

Updated documentation to have right format
2016-08-19 12:10:58 -07:00
Clement Ho
c887a131c0 Remove unused images 2016-08-03 13:11:11 -05:00
Jacob Schatz
3552900733 Merge branch 'convert-trans-bg-to-css' into 'master'
Convert image diff background image to CSS

## What does this MR do?
Replaces the `trans_bg.gif` image used for image diff background image with a CSS implementation of the same background image

## Are there points in the code the reviewer needs to double check?
None

## Why was this MR needed?
Uses CSS to replace the use of an image so that webpage rendering is slightly improved

## What are the relevant issue numbers?
Closes  

## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-01_at_12.29.10_PM](/uploads/8269877c561c29e6b0ca988079ff3fc6/Screen_Shot_2016-08-01_at_12.29.10_PM.png)

After:
![Screen_Shot_2016-08-01_at_12.29.16_PM](/uploads/cc88848b9c0e044445d19b889fd79271/Screen_Shot_2016-08-01_at_12.29.16_PM.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [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 
2016-08-03 03:42:01 +00:00
Clement Ho
fe23512c9d Convert switch icon into icon font 2016-08-01 15:09:03 -05:00
Clement Ho
d61b92a350 Convert image diff background image to CSS 2016-08-01 14:08:45 -05:00
Connor Shea
6a06c5cfb9
Upgrade Gemojione from 2.6.1 to 3.0.1.
This adds the 2016 emoji as well as support for using SVG images instead of PNGs.

It also fixes a number of incorrectly categorized emoji and other minor issues.

Upgrade Rake task for Gemojione 3.0.0 and generate sprites.

Upgrade aliases.json by pulling down index.json from the gemojione repository and running the generate_aliases.rb file.

Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md#v301-2016-07-16

For the specific emoji added to the Unicode standard, see: http://emojione.com/releases/2.2.4/

Huge kudos to Jonathan Wiesel (@jonathanwiesel) for his work on the gemojione gem!
2016-07-18 10:40:16 -06:00
Connor Shea
f31f78cea3
Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.
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.

Also fix the Rake task and update gemojione to 2.6.1. This adds the EmojiOne Spring update.

Changelog: https://github.com/jonathanwiesel/gemojione/blob/master/CHANGELOG.md
2016-06-29 14:53:09 -06:00
Peter Dave Hello
9e6f99744e
optimize png images losslessly using zopflipng 2016-06-29 19:22:15 +08:00
Robert Speicher
3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
Takuya Noguchi
114d023b1b Clean up the images from GitLab CI 2016-05-17 01:41:26 +09:00
Phil Hughes
b210b5be41 Crushed file size of emoji spritesheets 2016-02-19 11:45:26 +00:00
Phil Hughes
7952fec633 Award emoji supports retina displays 2016-02-19 11:15:58 +00:00
Robert Speicher
20fcc5d6f6 Update Emoji sprite and its SCSS for new styles 2016-02-17 19:01:25 -05:00
Janis Meybohm
da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00
Robert Speicher
3f452f539b Add gitlab_logo.png, remove brand_logo.png 2015-12-23 16:45:37 -05:00
Valery Sizov
a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Robert Speicher
9f30f5c635 Make icon-link image transparent 2015-12-01 18:20:01 -05:00
Douwe Maan
4773d98e83 Add Facebook authentication 2015-11-03 17:59:07 +01:00
Job van der Voort
dd0552c36d Animate the logo on hover
The logo is now rendered as pure SVG, rather than image referencing a
svg. The SVG has an id and the shapes of the logo have a shared class.
The shapes change their fill color on hover with a transition.
2015-10-21 08:59:30 +02:00
Douwe Maan
046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Robert Speicher
3f045b25d7 Fix transparency for msapplication-tile image
[ci skip]
2015-08-08 22:03:00 -04:00
Douwe Maan
70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Robert Speicher
353dc1e83e Update background color for touch-icon-* images 2015-07-10 14:03:56 -04:00
Robert Speicher
c4330d97b1 Add Windows 8 pinned site tile meta tags 2015-07-09 01:43:48 -04:00
Robert Speicher
6591485562 Add Safari/iOS versions of the logo 2015-07-09 01:43:46 -04:00
Dmitriy Zaporozhets
f5e0e5c0a3
Replace old logo with new one
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 16:59:16 +02:00
Max Borghino
a37ff6de88 Update oauth button logos for Twitter and Google
Both new buttons are 64x64 renders of the recommended assets
from each company.

Refs for those are:

 - https://about.twitter.com/press/twitter-brand-policy
 - https://developers.google.com/identity/branding-guidelines

Addresses issue 
2015-06-10 23:48:06 -07:00
Robert Schilling
38ba8b45ad Remove old GitLab auth image 2015-03-22 09:05:13 +01:00
Dmitriy Zaporozhets
9f1c284408 Remove 32px oauth images 2015-03-21 17:41:58 -07:00
Dmitriy Zaporozhets
a52529f9b6 Merge branch 'bitbucket-import'
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
2015-02-25 09:21:45 -08:00
Dmitriy Zaporozhets
ee343661e1 Get rid of black logo 2015-02-24 23:17:11 -08:00
Dmitriy Zaporozhets
6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Douwe Maan
ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Marcin Kulik
f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Valery Sizov
5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets
3588a07b83 Remove default project icon 2015-01-24 23:08:52 -08:00
Steven Thonus
42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Ivan Zotov
727363163e Optimize images 24.5% with ImageOptim. 2015-01-17 19:10:28 +03:00
Stefan Tatschner
bf079c24af Replace highlight.js with rouge-fork rugments
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets
62d2aed036
Improve login page behaviour
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-13 20:56:29 +03:00
Dmitriy Zaporozhets
ce30172cef
Fix brand logo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-11 15:10:41 +03:00
Dmitriy Zaporozhets
b93c1a562c
Use same login layout between CE and EE versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-11 15:05:40 +03:00
Dmitriy Zaporozhets
4656ef957a
Replace files icons with fontawesome
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-03 13:40:07 +03:00
Dmitriy Zaporozhets
0242124525
Fix 404 on jquery ui images
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 14:48:32 +03:00
Dmitriy Zaporozhets
ae4ae2b225
Move images from vendor to app so they are compiled by rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-12 10:19:24 +02:00