1. 26 Feb, 2016 7 commits
    • Alfredo Sumaran's avatar
      Update CHANGELOG · dead4f29
      Alfredo Sumaran authored
      dead4f29
    • Alfredo Sumaran's avatar
      08ec838e
    • Jacob Schatz's avatar
      Merge branch 'coffeescript_syntax_error' into 'master' · f150b8a5
      Jacob Schatz authored
      Fix syntax error in autosave coffeescript.
      
      According to http://coffeescript.org/#try , `catch` needs to have an argument.
      
      Otherwise, `Error: Parse error on line 19: Unexpected 'INDENT'` error is raised when converting to JS by coffee-script.
      
      Fixes gitlab-org/gitlab-ce#3302
      
      
      See merge request !2985
      f150b8a5
    • Marin Jankovski's avatar
      b2c641de
    • Rémy Coutable's avatar
      Merge branch 'rs-crowd-form-view-spec' into 'master' · bb3563b5
      Rémy Coutable authored
      Move "I should see Crowd login form" feature to a view spec
      
      We were doing all kinds of code gymnastics to "enable" Crowd in the
      feature spec and this would sometimes cause a transient failure.
      
      Really what it's testing is if the Crowd login form shows when Crowd's
      enabled, so this is much better suited to a view spec.
      
      See merge request !2963
      bb3563b5
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-1' into 'master' · 3f83d1dc
      Achilleas Pipinellis authored
      Reformats confusing '[named here]' section for 3rd party code attribution
      
      Weird formatting originally. Which of the following is the proper format for attribution?
      
      1. Submitted on behalf of a third-party: [David Alexander]
      1. Submitted on behalf of a third-party: [[] David Alexander]
      1. Submitted on behalf of a third-party: [] David Alexander
      1. Submitted on behalf of a third-party: [[ David Alexander ]]
      1. ... _etc._
      
      With this change, it allows for either of the following formats:
      
      1. Submitted on behalf of a third-party: [David Alexander]
      1. Submitted on behalf of a third-party: David Alexander
      
      See merge request !2861
      3f83d1dc
    • Achilleas Pipinellis's avatar
      Merge branch 'master' into 'master' · f37e031b
      Achilleas Pipinellis authored
      Add instructions for pushing tags as well as branches
      
      Current instructions will push the svn branches but not tags  - add missing line to tags
      
      
      See merge request !2778
      f37e031b
  2. 25 Feb, 2016 7 commits
  3. 24 Feb, 2016 26 commits