Commit graph

14 commits

Author SHA1 Message Date
Mike Greiling
69e4072f89 Merge branch 'master' into go-go-gadget-webpack
* master: (389 commits)
  Document "No gems fetched from git repositories" policy [ci skip]
  Typos
  Small gramatical tweaks
  Typos
  Added PHP & NPM doc
  Use `:empty_project` where possible in request specs
  Add caching of droplab ajax requests
  Use `:empty_project` where possible in model specs
  Revert 3f17f29a
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...
2017-01-27 19:33:58 -06:00
Mike Greiling
83ecc02daa resolve all prefer-const eslint violations 2017-01-18 20:33:02 -06:00
Mike Greiling
04eff5fdb0 resolve all x-spacing and no-spaced-x eslint violations 2017-01-18 17:18:40 -06:00
Mike Greiling
fe964cc235 migrate all javascript asset bundles and require syntax 2017-01-10 12:30:38 -06:00
Luke "Jared" Bennett
ebdea37138
Fix remove template 2017-01-04 19:37:32 +00:00
Mike Greiling
23f5865e18 expand remaining non-explicit eslint-disable blocks and factor out globals when no-undef encountered 2016-12-13 21:07:31 -06:00
winniehell
02f94cf038 disable ESLint for all JavaScript files 2016-10-26 10:02:58 +02:00
Luke Bennett
7664c76a16
Removed append logic
Updated test
2016-10-21 21:53:10 +01:00
Luke Bennett
ae851edc3c
Added no-template functionality
Added tests
2016-10-13 15:48:07 +01:00
Bryce Johnson
2d41c3f5a0 Restore inexplicably removed code from requestFileSuccess.
(also clean up a few global refs)
2016-10-05 12:48:18 +02:00
Bryce Johnson
14d681ebc8 Refactor TemplateSelector and fix for tests. 2016-10-05 11:25:05 +02:00
Joseph Frazier
e12f7a3b71 Combine requestFileSuccess arguments into opts
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6149#note_14830172
2016-10-03 12:16:02 -04:00
Joseph Frazier
ad2b6cae0b Append issue template to existing description
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21733

Add two newlines before the template if the existing description isn't
empty. This makes it easier to see where the template begins.

Don't append the template when "Reset template" is selected, of course.

Don't append template if it equals the existing description. This makes
it so that selecting a template twice doesn't duplicate it.
2016-10-03 12:16:02 -04:00
Felipe Artur
2872672945 Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00