Commit graph

10 commits

Author SHA1 Message Date
Douwe Maan
faa2e2df8f Rename commit_file, commit_dir and remove_file and update specs 2017-02-24 09:55:01 -06:00
Lin Jen-Shin
4587c78afa Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
* upstream/master: (1122 commits)
  Update CHANGELOG.md for 8.16.2
  Display project ID in project settings (!8572)
  fixed points from comments to improve code quality
  Update CHANGELOG.md for 8.14.8
  Statisfy eslint
  Add CHANGELOG entry
  Fix access to the wiki code via HTTP when repository feature disabled
  Display fullscreen button on small screens (!5302)
  Prevent removing fields from dropdowns on input elements
  fix for all themes
  Return struct instead of multiple values
  Fix race conditions for AuthorizedProjectsWorker
  Add User#nested_groups and User#nested_projects methods
  Fix spec failure due to timestamp ordering issue in mySQL
  Fixed error with filter keyboard tests
  `can?` already includes the `feature_available?` check
  Test there is no Merge Request button when MRs are disabled
  Ensure the correct Merge Request button is found
  Add 409 conflict tests
  Add CHANGELOG
  ...
2017-01-26 17:21:38 +08:00
Luke "Jared" Bennett
ebdea37138
Fix remove template 2017-01-04 19:37:32 +00:00
Lin Jen-Shin
07b9b80a88 Fix tests to use the new API 2016-12-08 19:11:52 +08: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
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
eed7960298 Fix issuable templates dropdown for forked projects 2016-09-15 15:51:09 -03:00
Phil Hughes
287663b2b1 Trigger autosize update after template selection
Closes #21982
2016-09-09 15:11:37 +01:00
Felipe Artur
2872672945 Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00