summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | 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 'remove-timezone-assertion-datetime-on-tooltips-spec' into 'mast...Alfredo Sumaran2017-01-021-1/+1
|\
| * Remove time zone information from assertion in timeago tooltips specremove-timezone-assertion-datetime-on-tooltips-specAdam Niedzielski2016-12-301-1/+1
* | Merge branch '22072-enable-haml-lints' into 'master' Alfredo Sumaran2016-12-31217-645/+634
|\ \
| * | HAMLLint: Fix `ImplicitDiv` offence post-rebase22072-enable-haml-lintsKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `TrailingWhitespace` offense post-rebaseKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `SpaceInsideHashAttributes` offenceKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `SpaceInsideHashAttributes` offencesKushal Pandya2016-12-31157-521/+514
| * | HAMLLint: Enable `SpaceInsideHashAttributes` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `TrailingWhitespace` offencesKushal Pandya2016-12-319-14/+12
| * | HAMLLint: Enable `TrailingWhitespace` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `SpaceBeforeScript` offencesKushal Pandya2016-12-3114-14/+14
| * | HAMLLint: Enable `SpaceBeforeScript` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `ImplicitDiv` offencesKushal Pandya2016-12-3141-52/+50
| * | HAMLLint: Enable `ImplicitDiv` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `HtmlAttributes` offencesKushal Pandya2016-12-314-8/+8
| * | HAMLLint: Enable `HtmlAttributes` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `FinalNewline` offencesKushal Pandya2016-12-316-6/+6
| * | HAMLLint: Enable `FinalNewline` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: Fix `ClassAttributeWithStaticValue` offencesKushal Pandya2016-12-3117-26/+26
| * | HAMLLint: Enable `ClassAttributeWithStaticValue` ruleKushal Pandya2016-12-311-1/+1
| * | HAMLLint: fix `AltText` offencesKushal Pandya2016-12-317-18/+18
| * | HAMLLint: Enable `AltText` ruleKushal Pandya2016-12-311-1/+1
|/ /
* | Merge branch '18556-polish-up-the-u2f-flow' into 'master' 26172-stages-icons-on-pipelines-page-skewedFatih Acet2016-12-307-83/+127
|\ \
| * | Improved the u2f flow18556-polish-up-the-u2f-flowLuke "Jared" Bennett2016-12-277-83/+127
* | | Merge branch '26201-sticky-tabs' into 'master' Fatih Acet2016-12-301-0/+4
|\ \ \
| * | | Make tabs full-width at small viewport26201-sticky-tabsAnnabel Dunstone Gray2016-12-291-0/+4
* | | | Merge branch 'fix-default-sort-order-spec-failures' into 'master' Sean McGivern2016-12-301-8/+2
|\ \ \ \
| * | | | Fix failures in default sort order specAdam Niedzielski2016-12-301-8/+2
| | |_|/ | |/| |
* | | | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-303-2/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Fix redirect after update file when user has forked projectFelipe Artur2016-12-293-2/+36
* | | | Merge branch 'feature/admin-merge-groups-and-projects' into 'master' Sean McGivern2016-12-308-32/+34
|\ \ \ \
| * | | | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-298-32/+34
* | | | | Merge branch 'fix-boards-search-typo' into 'master' Sean McGivern2016-12-304-5/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo: seach to searchfix-boards-search-typovictorwu2016-12-294-5/+9
|/ / / /
* | | | Merge branch '26192-fixes-too-short-input' into 'master' 23892-completing-an-item-in-a-task-list-removes-the-todo-flag-from-a-ticketFatih Acet2016-12-292-0/+10
|\ \ \ \
| * | | | changelog file added26192-fixes-too-short-inputNur Rony2016-12-291-0/+4
| * | | | fixes too short input for placeholder message in commit listing pageNur Rony2016-12-291-0/+6
View Lorry Controller Status