summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Fix CHANGELOG and wrong conflict resolutionRémy Coutable2016-10-061-1/+1
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-064-12/+14
|\
| * Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-284-13/+15
| |\
| | * Convert label creation from API to controller endpointNick Thomas2016-09-234-13/+15
* | | Merge branch 'flash-cherry-pick-error' into 'master' Fatih Acet2016-10-051-7/+2
|\ \ \
| * | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-errorBryce Johnson2016-10-051-7/+2
* | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-058-53/+150
|\ \ \ \
| * | | | Fix bad merge conflict resolution.Fatih Acet2016-10-051-2/+0
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283bFatih Acet2016-10-0525-906/+819
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-051-0/+19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Add position menu above ability to glDropdown.Fatih Acet2016-10-045-35/+37
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-047-30/+73
| |\ \ \ \ \ \
| * | | | | | | Tweak issuable dropdowns to open above the dropdown.Fatih Acet2016-10-041-0/+28
| * | | | | | | Fix dropdown title when No Label selected.Fatih Acet2016-10-042-23/+41
| * | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-045-18/+52
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-10-03134-704/+2053
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into revert-c676283bPhil Hughes2016-09-0228-157/+236
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed label toggle textPhil Hughes2016-08-301-14/+17
| * | | | | | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-30381-11049/+17329
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed up frontend code based on feedbackPhil Hughes2016-07-201-1/+1
| * | | | | | | | | | | Uses the selected values from the controller not the paramsPhil Hughes2016-07-201-2/+0
| * | | | | | | | | | | Removes tick from no label when selecting a labelPhil Hughes2016-07-201-0/+6
| * | | | | | | | | | | Fixed 'no label' being in dropdown toggle labelPhil Hughes2016-07-201-6/+4
| * | | | | | | | | | | Remove unnecesary update.label eventAlfredo Sumaran2016-07-202-2/+0
| * | | | | | | | | | | Fixed issuable sidebar label toggle not workingPhil Hughes2016-07-202-2/+2
| * | | | | | | | | | | Gets value from native element rather than converting to jquery elementPhil Hughes2016-07-201-1/+1
| * | | | | | | | | | | Updated how the label toggle gets the textPhil Hughes2016-07-202-62/+18
| * | | | | | | | | | | Added tests for new/edit issue formPhil Hughes2016-07-201-2/+2
| * | | | | | | | | | | Fixed failing label dropdown testsPhil Hughes2016-07-201-1/+1
| * | | | | | | | | | | Refactor label toggling for Labels dropdownAlfredo Sumaran2016-07-202-25/+61
| * | | | | | | | | | | Fix clearing fields not savingPhil Hughes2016-07-201-1/+1
| * | | | | | | | | | | Fixed label dropdown bugs with pre-selecting the toggle labelPhil Hughes2016-07-201-0/+1
| * | | | | | | | | | | Fixed label dropdown not selecting no labelsPhil Hughes2016-07-201-0/+4
| * | | | | | | | | | | GL dropdown default toggle colorPhil Hughes2016-07-205-6/+25
| * | | | | | | | | | | Fix issue with label select not correctly showing selected valuesPhil Hughes2016-07-202-16/+15
| * | | | | | | | | | | Fix issue with milestone dropdown submitting the form without selected valuePhil Hughes2016-07-201-3/+4
| * | | | | | | | | | | Use target_project instead of projectgPhil Hughes2016-07-201-0/+2
| * | | | | | | | | | | Revert "Merge branch 'revert-bdb6f1e6' into 'master'"Phil Hughes2016-07-206-15/+35
* | | | | | | | | | | | Merge branch 'fix_group_links_404' into 'master' Fatih Acet2016-10-054-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix group links 404barthc2016-10-054-6/+8
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'build-expire-sidebar' into 'master' Fatih Acet2016-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Correctly parse the date of artifact expiringbuild-expire-sidebarPhil Hughes2016-10-051-1/+1
* | | | | | | | | | | Merge branch '22295-grouped-pipeline-dropdown-should-be-a-scrollable-containe...Fatih Acet2016-10-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | added 245px max height and overflow scroll-y to .grouped-pipeline-dropdownDimitrie Hoekstra2016-10-051-1/+3
* | | | | | | | | | | | Merge branch '19499-project-dropdowns' into 'master' Annabel Dunstone Gray2016-10-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 19499 Update project dropdowns19499-project-dropdownstauriedavis2016-10-041-1/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'desplacturing' into 'master' Jacob Schatz2016-10-0523-907/+810
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Restore inexplicably removed code from requestFileSuccess.desplacturingBryce Johnson2016-10-054-11/+18
| * | | | | | | | | | | Simplify TemplateSelector keyup/blur handler.Bryce Johnson2016-10-051-5/+1