summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* resolve all no-plusplus eslint violationseslint-no-plusplusMike Greiling2017-01-1027-96/+96
* Merge branch '26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task'...Alfredo Sumaran2017-01-0645-106/+609
|\
| * fix right_sidebar_spec ajax call26226-generate-all-haml-fixtures-within-teaspoon-fixtures-taskMike Greiling2017-01-051-1/+2
| * replace Teaspoon fixture methods with jasmine-jquery methods to reduce depend...Mike Greiling2017-01-0541-97/+108
| * Merge branch 'fix-u2f-fixtures' into 26226-generate-all-haml-fixtures-within-...Mike Greiling2017-01-054-23/+36
| |\
| * | add CHANGELOG entry for !8384Mike Greiling2017-01-031-0/+4
| * | make projects.json easier to readMike Greiling2017-01-031-1/+445
| * | fix dynamic u2f fixturesMike Greiling2017-01-035-5/+37
| * | update all frontend tests to point to precompiled fixturesMike Greiling2017-01-0329-55/+55
| * | recursively clean compiled fixturesMike Greiling2017-01-031-1/+1
| * | create catch-all fixture generator for all static fixturesMike Greiling2017-01-031-0/+31
| * | allow storage of raw string fixturesMike Greiling2017-01-031-3/+15
* | | Merge branch 'speed-up-group-milestone-index' into 'master' Sean McGivern2017-01-0610-46/+172
|\ \ \
| * | | Speed up group milestone index by passing group_id to IssuesFinderAdam Niedzielski2017-01-0610-46/+172
* | | | Merge branch 'dz-whitelist-some-project-names' into 'master' Rémy Coutable2017-01-063-6/+5
|\ \ \ \
| * | | | Whitelist next project names: assets, profile, publicDmitriy Zaporozhets2017-01-063-6/+5
* | | | | Merge branch 'fix-users-api-500-error' into 'master' Rémy Coutable2017-01-063-7/+16
|\ \ \ \ \
| * | | | | Fix the failing spec in POST /users APIfix-users-api-500-errorRémy Coutable2017-01-052-7/+8
| * | | | | Add a failing spec to the POST /users APIRémy Coutable2017-01-041-0/+8
* | | | | | Merge branch 'set_ldap_config_attributes_defaults' into 'master' Rémy Coutable2017-01-065-12/+45
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | LDAP attributes needs default valuesDrew Blessing2017-01-065-12/+45
* | | | | | Merge branch 'fix-timezone-due-date-picker' into 'master' Alfredo Sumaran2017-01-064-5/+18
|\ \ \ \ \ \
| * | | | | | Wait for ajax after clicking on a dateAlfredo Sumaran2017-01-051-0/+4
| * | | | | | add comment to explain why we are avoiding the dateString constructor option ...fix-timezone-due-date-pickerMike Greiling2017-01-021-0/+1
| * | | | | | make expected due_date value format explicitMike Greiling2017-01-021-1/+1
| * | | | | | remove unnecessary utility functionMike Greiling2017-01-022-17/+3
| * | | | | | remove unnecessary fixtures and testsMike Greiling2017-01-024-90/+2
| * | | | | | add rspec feature testMike Greiling2017-01-021-2/+4
| * | | | | | fix eslint complaintsMike Greiling2017-01-021-3/+3
| * | | | | | use single sprockets require comment style and remove eslint-disableMike Greiling2017-01-021-4/+4
| * | | | | | fix eslint violationsMike Greiling2017-01-021-3/+3
| * | | | | | add MR number to changelog entryMike Greiling2017-01-021-1/+1
| * | | | | | Pass date as integer params on instantiate new Date in order to avoid time zo...giulianovarriale2017-01-026-3/+111
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-u2f-fixtures' into 'master' Alfredo Sumaran2017-01-056-6/+51
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | generate u2f frontend fixtures dynamicallyMike Greiling2017-01-055-5/+49
| * | | | force utf-8 encoding for prior to fixture parsing to prevent nokogiri issuesMike Greiling2017-01-051-0/+1
| * | | | exclude script type=text/template from dom scrubbingMike Greiling2017-01-051-1/+1
| |/ / /
* | | | Merge branch '26352-user-dropdown-settings' into 'master' Annabel Dunstone Gray2017-01-054-4/+8
|\ \ \ \
| * | | | 26352 Change Profile settings to User / Settings26352-user-dropdown-settingstauriedavis2017-01-044-4/+8
* | | | | Merge branch 'markdown-button-newline-bug-fix' into 'master' Fatih Acet2017-01-052-3/+70
|\ \ \ \ \
| * | | | | Fixed first newline not workingmarkdown-button-newline-bug-fixPhil Hughes2016-12-212-1/+49
| * | | | | Fixed new line being included in bold/italic in GFM formPhil Hughes2016-12-211-3/+22
* | | | | | Merge branch '26155-merge-request-tabs-don-t-render-when-no-commits-available...Fatih Acet2017-01-057-57/+80
|\ \ \ \ \ \
| * | | | | | include all expected instance vars for _show.html.haml template within tests26155-merge-request-tabs-don-t-render-when-no-commits-availableMike Greiling2017-01-032-2/+7
| * | | | | | fix failing testsMike Greiling2017-01-031-5/+14
| * | | | | | prevent 500 error when selecting changes tab for non-existent branchMike Greiling2017-01-031-1/+1
| * | | | | | add CHANGELOG.md entry for !8347Mike Greiling2017-01-031-0/+4
| * | | | | | show empty state for commits tab when no commits presentMike Greiling2017-01-031-2/+8
| * | | | | | render merge request tabs regardless of commit historyMike Greiling2017-01-031-47/+46
* | | | | | | Merge branch '26346-cannot-reset-or-remove-mr-issues-description-templates' i...Fatih Acet2017-01-052-13/+10
|\ \ \ \ \ \ \
View Lorry Controller Status