summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttonsFilipa Lacerda2017-11-065-3/+33
|\
| * Use diff_discussion? instead of is_a?(DiffDiscussion)38677-render-new-discussions-on-diff-tabLuke "Jared" Bennett2017-11-021-1/+1
| * Added changelogLuke "Jared" Bennett2017-10-301-0/+5
| * FE review changes - remove internal details assertion and look for closest fo...Luke "Jared" Bennett2017-10-272-5/+1
| * Add spec for root diff discussion noteLuke "Jared" Bennett2017-10-241-2/+22
| * Fix karmaLuke "Jared" Bennett2017-10-232-1/+2
| * Remove trailing commaLuke "Jared" Bennett2017-10-211-1/+1
| * Improve discussion_line_code set and update notes_controller_specLuke "Jared" Bennett2017-10-212-1/+7
| * Added discussion_line_code value to note response and use it to query the rig...Luke "Jared" Bennett2017-10-212-2/+4
* | Merge branch 'fix/sm/37299-environments-validate-uniqueness-on-url-and-can-ca...Kamil Trzciński2017-11-062-2/+0
|\ \
| * | Remove unique validation from external_url in Environmentfix/sm/37299-environments-validate-uniqueness-on-url-and-can-cause-silent-deployment-failuresShinya Maeda2017-11-062-2/+0
* | | Merge branch 'fix/sm/39817-fix-cron_parser_spec-rb' into 'master'Rémy Coutable2017-11-061-6/+42
|\ \ \ | |/ / |/| |
| * | Add TimeCop freeze for DST and Regular timefix/sm/39817-fix-cron_parser_spec-rbShinya Maeda2017-11-051-6/+42
|/ /
* | Merge branch '37473-expose-project-visibility-as-ci-variable' into 'master'Kamil Trzciński2017-11-054-1/+9
|\ \
| * | Harcode project visibility37473-expose-project-visibility-as-ci-variableMatija Čupić2017-11-051-1/+1
| * | Expose project visibility as CI variableMatija Čupić2017-11-044-1/+9
* | | Merge branch 'fix_migration_that_adds_ff_merge_field' into 'master'Stan Hu2017-11-042-1/+10
|\ \ \ | |/ / |/| |
| * | update a changelogValery Sizov2017-11-041-0/+5
| * | Put a condition to old migration that adds fast_forward column to MRsValery Sizov2017-11-041-1/+5
|/ /
* | Merge branch 'sh-headless-chrome-support' into 'master'Stan Hu2017-11-03149-456/+624
|\ \
| * | fix flaky tests by removing unneeded clicks and focus actionsMike Greiling2017-11-031-16/+1
| * | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-03102-834/+1294
| |\ \
| * | | fix flaky test in gfm_autocomplete_spec.rbMike Greiling2017-11-031-1/+0
| * | | don't attempt to click on hidden elementsMike Greiling2017-11-031-4/+6
| * | | replace use of unsupported trigger method with clickMike Greiling2017-11-032-2/+2
| * | | prevent race condition when attempting to cancel a file uploadMike Greiling2017-11-031-2/+4
| * | | confirm javascript modal when resetting email tokensMike Greiling2017-11-031-2/+2
| * | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-02433-3801/+4275
| |\ \ \
| * | | | use resize_window helperMike Greiling2017-11-021-1/+2
| * | | | refactor wait_for_requests, add slow_requests block helperMike Greiling2017-11-029-50/+64
| * | | | target label instead of obscured input elementMike Greiling2017-11-021-3/+1
| * | | | scroll to top before attempting to click the "Side-by-side" buttonMike Greiling2017-11-021-3/+2
| * | | | remove out-of-date comments about webdriver compatabilityMike Greiling2017-11-021-5/+1
| * | | | explicitly add Accept: */* HTTP header back to testMike Greiling2017-11-021-1/+3
| * | | | add visible argument to helper rather than duplicating codeMike Greiling2017-11-021-3/+3
| * | | | add InspectRequests helper automatically to :js testsMike Greiling2017-11-024-5/+1
| * | | | add CookieHelper and InputHelper automatically to :js testsMike Greiling2017-11-0210-18/+2
| * | | | fix bracket stylingMike Greiling2017-11-021-5/+5
| * | | | remove unused capybara_select2 helperMike Greiling2017-11-011-5/+0
| * | | | add spacing around yieldMike Greiling2017-11-011-0/+2
| * | | | add slow_requests! to filtered search tests which expect to see a loading spi...Mike Greiling2017-11-015-0/+10
| * | | | make window resizing more resiliant on small screens when headless mode is offMike Greiling2017-11-011-3/+7
| * | | | fix flaky fill_in use in which return key would occasionally be intercepted b...Mike Greiling2017-11-011-2/+2
| * | | | move resize option the pre-test hooks instead of post-testMike Greiling2017-11-011-3/+3
| * | | | enable CHROME_HEADLESS environment variable for Spinach tests similar to RSpecMike Greiling2017-11-011-1/+4
| * | | | reset browser window size between testsMike Greiling2017-11-011-0/+3
| * | | | explicitly check innerText since selenium webdriver only looks at visible textMike Greiling2017-11-011-1/+1
| * | | | prevent resolve buttons from being clicked twice triggering a race conditionMike Greiling2017-11-011-4/+2
| * | | | add accept_confirm around "remove" buttonMike Greiling2017-10-311-1/+1
| * | | | remove PhantomJS specific hacksMike Greiling2017-10-315-16/+0
View Lorry Controller Status