Commit e57b27d4 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

parents 8d24b935 69630394
...@@ -18,6 +18,7 @@ v 7.12.0 (unreleased) ...@@ -18,6 +18,7 @@ v 7.12.0 (unreleased)
- Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu) - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu)
- Fix clone URL losing selection after a single click in Safari and Chrome (Stan Hu) - Fix clone URL losing selection after a single click in Safari and Chrome (Stan Hu)
- Fix git blame syntax highlighting when different commits break up lines (Stan Hu) - Fix git blame syntax highlighting when different commits break up lines (Stan Hu)
- Add "Resend confirmation e-mail" link in profile settings (Stan Hu)
- Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka) - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
- Disabled expansion of top/bottom blobs for new file diffs - Disabled expansion of top/bottom blobs for new file diffs
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka) - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
......
...@@ -195,20 +195,20 @@ gem "uglifier" ...@@ -195,20 +195,20 @@ gem "uglifier"
gem 'turbolinks', '~> 2.5.0' gem 'turbolinks', '~> 2.5.0'
gem 'jquery-turbolinks' gem 'jquery-turbolinks'
gem 'select2-rails' gem 'addressable'
gem 'jquery-atwho-rails', '~> 1.0.0'
gem "jquery-rails"
gem "jquery-ui-rails"
gem "jquery-scrollto-rails"
gem "raphael-rails", "~> 2.1.2"
gem 'bootstrap-sass', '~> 3.0' gem 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 4.2' gem 'font-awesome-rails', '~> 4.2'
gem "gitlab_emoji", "~> 0.1" gem 'gitlab_emoji', '~> 0.1'
gem "gon", '~> 5.0.0' gem 'gon', '~> 5.0.0'
gem 'jquery-atwho-rails', '~> 1.0.0'
gem 'jquery-rails', '3.1.2'
gem 'jquery-scrollto-rails'
gem 'jquery-ui-rails'
gem 'nprogress-rails' gem 'nprogress-rails'
gem 'raphael-rails', '~> 2.1.2'
gem 'request_store' gem 'request_store'
gem "virtus" gem 'select2-rails'
gem 'addressable' gem 'virtus'
group :development do group :development do
gem 'brakeman', require: false gem 'brakeman', require: false
......
...@@ -301,7 +301,7 @@ GEM ...@@ -301,7 +301,7 @@ GEM
ice_cube (0.11.1) ice_cube (0.11.1)
ice_nine (0.10.0) ice_nine (0.10.0)
jquery-atwho-rails (1.0.1) jquery-atwho-rails (1.0.1)
jquery-rails (3.1.0) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-scrollto-rails (1.4.3) jquery-scrollto-rails (1.4.3)
...@@ -746,7 +746,7 @@ DEPENDENCIES ...@@ -746,7 +746,7 @@ DEPENDENCIES
html-pipeline (~> 1.11.0) html-pipeline (~> 1.11.0)
httparty httparty
jquery-atwho-rails (~> 1.0.0) jquery-atwho-rails (~> 1.0.0)
jquery-rails jquery-rails (= 3.1.2)
jquery-scrollto-rails jquery-scrollto-rails
jquery-turbolinks jquery-turbolinks
jquery-ui-rails jquery-ui-rails
......
...@@ -49,8 +49,6 @@ window.slugify = (text) -> ...@@ -49,8 +49,6 @@ window.slugify = (text) ->
window.ajaxGet = (url) -> window.ajaxGet = (url) ->
$.ajax({type: "GET", url: url, dataType: "script"}) $.ajax({type: "GET", url: url, dataType: "script"})
window.showAndHide = (selector) ->
window.split = (val) -> window.split = (val) ->
return val.split( /,\s*/ ) return val.split( /,\s*/ )
...@@ -92,15 +90,7 @@ window.disableButtonIfAnyEmptyField = (form, form_selector, button_selector) -> ...@@ -92,15 +90,7 @@ window.disableButtonIfAnyEmptyField = (form, form_selector, button_selector) ->
window.sanitize = (str) -> window.sanitize = (str) ->
return str.replace(/<(?:.|\n)*?>/gm, '') return str.replace(/<(?:.|\n)*?>/gm, '')
window.linkify = (str) ->
exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
return str.replace(exp,"<a href='$1'>$1</a>")
window.simpleFormat = (str) ->
linkify(sanitize(str).replace(/\n/g, '<br />'))
window.unbindEvents = -> window.unbindEvents = ->
$(document).unbind('scroll')
$(document).off('scroll') $(document).off('scroll')
window.shiftWindow = -> window.shiftWindow = ->
...@@ -196,14 +186,3 @@ $ -> ...@@ -196,14 +186,3 @@ $ ->
new ConfirmDangerModal(form, text) new ConfirmDangerModal(form, text)
new Aside() new Aside()
(($) ->
# Disable an element and add the 'disabled' Bootstrap class
$.fn.extend disable: ->
$(@).attr('disabled', 'disabled').addClass('disabled')
# Enable an element and remove the 'disabled' Bootstrap class
$.fn.extend enable: ->
$(@).removeAttr('disabled').removeClass('disabled')
)(jQuery)
$.fn.showAndHide = -> # Disable an element and add the 'disabled' Bootstrap class
$(@).show(). $.fn.extend disable: ->
delay(3000). $(@)
fadeOut() .attr('disabled', 'disabled')
.addClass('disabled')
$.fn.enableButton = ->
$(@).removeAttr('disabled').
removeClass('disabled')
$.fn.disableButton = ->
$(@).attr('disabled', 'disabled').
addClass('disabled')
# Enable an element and remove the 'disabled' Bootstrap class
$.fn.extend enable: ->
$(@)
.removeAttr('disabled')
.removeClass('disabled')
...@@ -12,11 +12,11 @@ class @Profile ...@@ -12,11 +12,11 @@ class @Profile
$(this).find('.update-failed').hide() $(this).find('.update-failed').hide()
$('.update-username form').on 'ajax:complete', -> $('.update-username form').on 'ajax:complete', ->
$(this).find('.btn-save').enableButton() $(this).find('.btn-save').enable()
$(this).find('.loading-gif').hide() $(this).find('.loading-gif').hide()
$('.update-notifications').on 'ajax:complete', -> $('.update-notifications').on 'ajax:complete', ->
$(this).find('.btn-save').enableButton() $(this).find('.btn-save').enable()
$('.js-choose-user-avatar-button').bind "click", -> $('.js-choose-user-avatar-button').bind "click", ->
......
#= require dropzone
#= require mousetrap
#= require mousetrap/pause
class @ZenMode class @ZenMode
constructor: -> constructor: ->
@active_zen_area = null @active_zen_area = null
...@@ -26,7 +30,7 @@ class @ZenMode ...@@ -26,7 +30,7 @@ class @ZenMode
@exitZenMode() @exitZenMode()
$(document).on 'keydown', (e) => $(document).on 'keydown', (e) =>
if e.keyCode is $.ui.keyCode.ESCAPE if e.keyCode is 27 # Esc
@exitZenMode() @exitZenMode()
e.preventDefault() e.preventDefault()
...@@ -42,7 +46,9 @@ class @ZenMode ...@@ -42,7 +46,9 @@ class @ZenMode
@active_checkbox.prop('checked', false) @active_checkbox.prop('checked', false)
@active_zen_area = null @active_zen_area = null
@active_checkbox = null @active_checkbox = null
window.location.hash = '' @restoreScroll(@scroll_position)
window.scrollTo(window.pageXOffset, @scroll_position)
# Enable dropzone when leaving ZEN mode # Enable dropzone when leaving ZEN mode
Dropzone.forElement('.div-dropzone').enable() Dropzone.forElement('.div-dropzone').enable()
restoreScroll: (y) ->
window.scrollTo(window.pageXOffset, y)
.zennable { .zennable {
position: relative; position: relative;
input { .zen-toggle-comment {
display: none; display: none;
} }
...@@ -26,10 +26,12 @@ ...@@ -26,10 +26,12 @@
} }
} }
// Hide the Enter link when we're in Zen mode
input:checked ~ .zen-backdrop .zen-enter-link { input:checked ~ .zen-backdrop .zen-enter-link {
display: none; display: none;
} }
// Show the Leave link when we're in Zen mode
input:checked ~ .zen-backdrop .zen-leave-link { input:checked ~ .zen-backdrop .zen-leave-link {
display: block; display: block;
position: absolute; position: absolute;
...@@ -62,6 +64,9 @@ ...@@ -62,6 +64,9 @@
} }
} }
// Make the placeholder text in the standard textarea the same color as the
// background, effectively hiding it
.zen-backdrop textarea::-webkit-input-placeholder { .zen-backdrop textarea::-webkit-input-placeholder {
color: white; color: white;
} }
...@@ -78,6 +83,9 @@ ...@@ -78,6 +83,9 @@
color: white; color: white;
} }
// Make the color of the placeholder text in the Zenned-out textarea darker,
// so it becomes visible
input:checked ~ .zen-backdrop textarea::-webkit-input-placeholder { input:checked ~ .zen-backdrop textarea::-webkit-input-placeholder {
color: #999; color: #999;
} }
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
- if event.rm_ref? - if event.rm_ref?
%strong= event.ref_name %strong= event.ref_name
- else - else
= link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name) do %strong
%strong= event.ref_name = link_to event.ref_name, namespace_project_commits_path(event.project.namespace, event.project, event.ref_name)
at at
= link_to_project event.project = link_to_project event.project
......
...@@ -37,8 +37,11 @@ ...@@ -37,8 +37,11 @@
= f.text_field :email, class: "form-control", required: true = f.text_field :email, class: "form-control", required: true
- if @user.unconfirmed_email.present? - if @user.unconfirmed_email.present?
%span.help-block %span.help-block
Please click the link in the confirmation email before continuing, it was sent to Please click the link in the confirmation email before continuing. It was sent to
= succeed "." do
%strong #{@user.unconfirmed_email} %strong #{@user.unconfirmed_email}
%p
= link_to "Resend confirmation e-mail", user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post
- else - else
%span.help-block We also use email for avatar detection if no avatar is uploaded. %span.help-block We also use email for avatar detection if no avatar is uploaded.
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}"); $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.save-project-loader').hide(); $('.save-project-loader').hide();
$('.project-edit-container').show(); $('.project-edit-container').show();
$('.project-edit-content .btn-save').enableButton(); $('.project-edit-content .btn-save').enable();
#= require extensions/array
describe 'Array extensions', ->
describe 'first', ->
it 'returns the first item', ->
arr = [0, 1, 2, 3, 4, 5]
expect(arr.first()).toBe(0)
describe 'last', ->
it 'returns the last item', ->
arr = [0, 1, 2, 3, 4, 5]
expect(arr.last()).toBe(5)
#= require extensions/jquery
describe 'jQuery extensions', ->
describe 'disable', ->
beforeEach ->
fixture.set '<input type="text" />'
it 'adds the disabled attribute', ->
$input = $('input').first()
$input.disable()
expect($input).toHaveAttr('disabled', 'disabled')
it 'adds the disabled class', ->
$input = $('input').first()
$input.disable()
expect($input).toHaveClass('disabled')
describe 'enable', ->
beforeEach ->
fixture.set '<input type="text" disabled="disabled" class="disabled" />'
it 'removes the disabled attribute', ->
$input = $('input').first()
$input.enable()
expect($input).not.toHaveAttr('disabled')
it 'removes the disabled class', ->
$input = $('input').first()
$input.enable()
expect($input).not.toHaveClass('disabled')
.zennable
%input#zen-toggle-comment.zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
.zen-backdrop
%textarea#note_note.js-gfm-input.markdown-area{placeholder: 'Leave a comment'}
%a.zen-enter-link{tabindex: '-1'}
%i.fa.fa-expand
Edit in fullscreen
%a.zen-leave-link
%i.fa.fa-compress
# Teaspoon includes some support files, but you can use anything from your own
# support path too.
# require support/jasmine-jquery-1.7.0
# require support/jasmine-jquery-2.0.0
# require support/jasmine-jquery-2.1.0
# require support/sinon
# require support/your-support-file
# PhantomJS (Teaspoons default driver) doesn't have support for # PhantomJS (Teaspoons default driver) doesn't have support for
# Function.prototype.bind, which has caused confusion. Use this polyfill to # Function.prototype.bind, which has caused confusion. Use this polyfill to
# avoid the confusion. # avoid the confusion.
...@@ -21,6 +12,15 @@ ...@@ -21,6 +12,15 @@
#= require bootstrap #= require bootstrap
#= require underscore #= require underscore
# Teaspoon includes some support files, but you can use anything from your own
# support path too.
# require support/jasmine-jquery-1.7.0
# require support/jasmine-jquery-2.0.0
#= require support/jasmine-jquery-2.1.0
# require support/sinon
# require support/your-support-file
# Deferring execution # Deferring execution
# If you're using CommonJS, RequireJS or some other asynchronous library you can # If you're using CommonJS, RequireJS or some other asynchronous library you can
......
#= require zen_mode
describe 'ZenMode', ->
fixture.preload('zen_mode.html')
beforeEach ->
fixture.load('zen_mode.html')
# Stub Dropzone.forElement(...).enable()
spyOn(Dropzone, 'forElement').and.callFake ->
enable: -> true
@zen = new ZenMode()
# Set this manually because we can't actually scroll the window
@zen.scroll_position = 456
# Ohmmmmmmm
enterZen = ->
$('.zen-toggle-comment').prop('checked', true).trigger('change')
# Wh- what was that?!
exitZen = ->
$('.zen-toggle-comment').prop('checked', false).trigger('change')
describe 'on enter', ->
it 'pauses Mousetrap', ->
spyOn(Mousetrap, 'pause')
enterZen()
expect(Mousetrap.pause).toHaveBeenCalled()
describe 'in use', ->
beforeEach ->
enterZen()
it 'exits on Escape', ->
$(document).trigger(jQuery.Event('keydown', {keyCode: 27}))
expect($('.zen-toggle-comment').prop('checked')).toBe(false)
describe 'on exit', ->
beforeEach ->
enterZen()
it 'unpauses Mousetrap', ->
spyOn(Mousetrap, 'unpause')
exitZen()
expect(Mousetrap.unpause).toHaveBeenCalled()
it 'restores the scroll position', ->
spyOn(@zen, 'restoreScroll')
exitZen()
expect(@zen.restoreScroll).toHaveBeenCalledWith(456)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment