summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdownSean McGivern2017-01-033-3/+129
|\ | | | | | | | | Add tests to cycle analytics See merge request !7727
| * Make haml_lint happyadd-tests-to-cycle-analyticsAlfredo Sumaran2017-01-021-1/+1
| |
| * Improve specAlfredo Sumaran2017-01-021-11/+9
| |
| * Add feature tests for Cycle AnalyticsAlfredo Sumaran2017-01-023-4/+132
| |
* | Merge branch 'api-fix-extern-uid-validation' into 'master' Sean McGivern2017-01-032-3/+3
|\ \ | | | | | | | | | | | | | | | | | | API: extern_uid is a string Closes #26227 See merge request !8404
| * | API: extern_uid is a stringapi-fix-extern-uid-validationRobert Schilling2017-01-032-3/+3
| |/
* | Merge branch 'octokit' into 'master' Sean McGivern2017-01-032-4/+4
|\ \ | | | | | | | | | | | | Update octokit to 4.6.2 See merge request !8158
| * | Update octokit to 4.6.2Manuel Rüger2016-12-302-4/+4
| | | | | | | | | | | | ChangeLog: https://github.com/octokit/octokit.rb/releases
* | | Merge branch '26218-rety-button-pipeline-builds-name-drodown-broken' into ↵25564-uniquely-and-uniformly-style-status-badgesFatih Acet2017-01-022-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Increases pipeline graph drowdown width in order to prevent strange position on chrome on ubuntu Closes #26218 See merge request !8399
| * | | Increases pipeline graph drowdown width in order to prevent strange position ↵Filipa Lacerda2017-01-022-2/+6
|/ / / | | | | | | | | | | | | | | | on chrome on ubuntu Adds MR ID to changelog entry
* | | Merge branch 'remove-timezone-assertion-datetime-on-tooltips-spec' into ↵Alfredo Sumaran2017-01-021-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Remove time zone information from assertion in timeago tooltips spec Closes #26183 See merge request !8374
| * | Remove time zone information from assertion in timeago tooltips specremove-timezone-assertion-datetime-on-tooltips-specAdam Niedzielski2016-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows the test to pass when your local time zone is different than UTC. "Date Format" JavaScript library uses a custom, non-standard format when displaying time zone part of the datetime. There is no point in trying to replicate this behavior in Ruby.
* | | Merge branch '22072-enable-haml-lints' into 'master' Alfredo Sumaran2016-12-31217-645/+634
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable HAML-LINT linters Closes #22072 See merge request !8247
| * | | 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 flow Closes #18556 See merge request !8304
| * | | Improved the u2f flow18556-polish-up-the-u2f-flowLuke "Jared" Bennett2016-12-277-83/+127
| | | | | | | | | | | | | | | | Added tests
* | | | Merge branch '26201-sticky-tabs' into 'master' Fatih Acet2016-12-301-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tabs full-width at small viewport Closes #26201 See merge request !8369
| * | | | 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 spec See merge request !8379
| * | | | | Fix failures in default sort order specAdam Niedzielski2016-12-301-8/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test cases were not waiting for page load after clicking. This caused failures in test cases that were executed right after these incorrect ones, because of requests hitting server after a test was finished. We do not have to click links, we can go directly to a correct page by passing parameters in the URL.
* | | | | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-303-2/+36
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix redirect after update file when user has forked project Closes #25578 See merge request !8371
| * | | | 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 profiles Closes #24752 See merge request !8323
| * | | | | 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 boards search typo See merge request !8370
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes too short input for placeholder message in commit listing page Closes #26192 See merge request !8367
| * | | | 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
| | | | |
* | | | | Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into ↵Fatih Acet2016-12-293-5/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move award emoji's out of the discussion tab for merge requests Closes #25996 See merge request !8358
| * | | | Fix MR versions spec25996-Move-award-emoji-out-of-the-discussion-tab-for-MRAnnabel Dunstone Gray2016-12-291-2/+2
| | | | |
| * | | | Move award emoji's out of the discussion tab for merge requestsdimitrieh2016-12-282-3/+7
| | | | |
View Lorry Controller Status