summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23025-issue-boards-defaults' into 'master' Jacob Schatz2016-10-061-4/+2
|\
| * Change issue board defaultsAnnabel Dunstone Gray2016-10-061-4/+2
* | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-061-7/+5
|\ \
| * | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-051-7/+5
* | | Merge branch 'update-profile-view' into 'master' Annabel Dunstone Gray2016-10-061-18/+7
|\ \ \
| * | | spacing tweaksupdate-profile-viewtauriedavis2016-10-061-12/+1
| * | | add spaces and fix handle stylestauriedavis2016-10-041-4/+8
| * | | update profile viewtauriedavis2016-10-031-6/+2
* | | | Merge branch 'dz-root-url' into 'master' Dmitriy Zaporozhets2016-10-062-10/+5
|\ \ \ \
| * | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-062-10/+5
| | |_|/ | |/| |
* | | | Merge branch 'replace-bootstrap-caret' into 'master' Jacob Schatz2016-10-067-33/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Replace bootstrap caret with fontawesome caretClement Ho2016-10-057-33/+36
* | | | Merge branch 'issue-boards-new-issue' into 'master' Fatih Acet2016-10-067-5/+121
|\ \ \ \
| * | | | Remove the code finding an issue by undefinedPhil Hughes2016-10-061-2/+1
| * | | | Shows error if response returns an errorissue-boards-new-issuePhil Hughes2016-10-061-2/+19
| * | | | Fix form not re-enabling thanks to jQueryPhil Hughes2016-10-063-3/+7
| * | | | Made the CSS a bit more reasonablePhil Hughes2016-10-062-7/+3
| * | | | Moved form outside of listPhil Hughes2016-10-062-3/+11
| * | | | Fixed issue with backlog list not savingPhil Hughes2016-10-062-3/+4
| * | | | Added ability to save the new issuePhil Hughes2016-10-065-3/+35
| * | | | Add new issue form to listsPhil Hughes2016-10-064-3/+62
* | | | | MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-062-5/+23
|/ / / /
* | | | 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
View Lorry Controller Status