summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* converted last method to jQuerytidy-up-pipeline-jsLuke Bennett2016-10-202-13/+20
* Tidied up pipelines.js.es6 and removed jQuery where acceptable.Luke "Jared" Bennett2016-10-201-11/+13
* Create protected branches bundleAlfredo Sumaran2016-10-206-0/+1
* Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into 'm...Fatih Acet2016-10-191-1/+1
|\
| * Return the title for id of 'No label'23375-filtering-on-any-label-or-no-label-does-not-workLuke Bennett2016-10-191-1/+1
* | Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-191-0/+2
* | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-191-0/+11
|\ \ | |/ |/|
| * Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-3/+35
| |\
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1813-433/+721
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 22191-delete-dy...Kamil Trzcinski2016-10-175-109/+172
| |\ \ \
| * | | | Updates class name for consistencyFilipa Lacerda2016-10-171-2/+2
| * | | | Improve after code reviewKamil Trzcinski2016-10-171-1/+1
| * | | | Updates MR template to include stop linkFilipa Lacerda2016-10-171-0/+11
* | | | | Require missing Vue dependencyAlfredo Sumaran2016-10-181-0/+2
| |_|_|/ |/| | |
* | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-1813-433/+721
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1812-432/+720
| |\ \ \
| | * | | Provide better error message to the usermerge-conflicts-editor-2Alfredo Sumaran2016-10-171-1/+1
| | * | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-173-108/+162
| | |\ \ \
| | * \ \ \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1715-84/+563
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| | * | | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| | * | | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| | * | | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-132-2/+4
| | * | | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-10/+93
| | * | | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| | * | | | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-132-1/+14
| | * | | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-132-133/+150
| | * | | | Refactor JS codeAlfredo Sumaran2016-10-135-4/+537
| | * | | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| | * | | | Replace textarea with Ace editorAlfredo Sumaran2016-10-131-7/+20
| | * | | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-133-54/+234
| * | | | | Update endpoint to username validatorAlfredo Sumaran2016-10-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-3/+35
|/ / / /
* | | | Merge branch '23358-expand-hide-pipeline-btn-text-doesn-t-match' into 'master' Fatih Acet2016-10-171-1/+1
|\ \ \ \
| * | | | Swapped button text manipulation outcomes for the toggle queryLuke Bennett2016-10-171-1/+1
| | |_|/ | |/| |
* | | | Fixed find file keyboard navigationfind-file-enter-fixPhil Hughes2016-10-171-0/+9
|/ / /
* | | Convert due_date_select.js filetype to es6.safari-is-baNaNasBryce Johnson2016-10-173-108/+162
* | | Stop directly parsing due_date with Date.parse, prefer parsing implicitly.Bryce Johnson2016-10-171-2/+2
| |/ |/|
* | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-161-1/+12
* | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-151-4/+3
* | Convert dispatcher to es6.Bryce Johnson2016-10-151-0/+0
* | Fixup invalid refs.Bryce Johnson2016-10-152-2/+2
* | Convert field error NodeList to an Array.Bryce Johnson2016-10-151-2/+2
* | Use native dom in dispatcher field error init.Bryce Johnson2016-10-151-3/+4
* | Improve method naming in gl_field_errors.Bryce Johnson2016-10-151-21/+22
* | Add accessor for current val for convenience.Bryce Johnson2016-10-151-5/+9
* | Safely scope siblings of validated input.Bryce Johnson2016-10-151-2/+15
* | Remove superfluous comment.Bryce Johnson2016-10-151-1/+0
* | Prevent unneccessary loading of UsernameValidator.Bryce Johnson2016-10-151-1/+0
* | Properly implement focus on first invalid.Bryce Johnson2016-10-151-11/+6