summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-marginTim Zallmann2017-06-1613-249/+137
|\
| * fix frontend test failures after jasmine upgradekarma-headless-chrome-reduxMike Greiling2017-06-152-3/+3
| * remove debug flag, but continue to log chrome outputMike Greiling2017-06-141-1/+1
| * upgrade jasmine to attempt to resolve browser timeout issuesMike Greiling2017-06-142-17/+11
| * add DEBUG flag option to karma configMike Greiling2017-06-142-6/+20
| * run chrome with --no-sandbox flag to get around docker privilege limitationsMike Greiling2017-06-142-7/+5
| * upgrade karma to v1.7.0Mike Greiling2017-06-142-72/+70
| * force chrome to produce debug output as it runs in CIMike Greiling2017-06-142-1/+12
| * add CHANGELOG.md entry for !12036Mike Greiling2017-06-141-0/+4
| * remove phantomjs-specific test hacksMike Greiling2017-06-145-50/+10
| * update karma job to use chrome build image created by gitlab-build-images!41Mike Greiling2017-06-141-1/+1
| * test new docker image with headless chromeMike Greiling2017-06-141-0/+1
| * remove phantomjs from our frontend dev dependenciesMike Greiling2017-06-142-118/+8
| * fix incorrect equals assertionMike Greiling2017-06-141-1/+1
| * replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-143-2/+20
* | Merge branch 'issue-board-docs' into 'master'Achilleas Pipinellis2017-06-161-2/+3
|\ \
| * | Update issue_board.mdissue-board-docsVictor Wu2017-06-151-2/+3
* | | Merge branch 'jira-integ-docs' into 'master'Achilleas Pipinellis2017-06-162-3/+3
|\ \ \
| * | | Jira integ docsVictor Wu2017-06-162-3/+3
|/ / /
* | | Merge branch 'confidential-issues-redesign-docs' into 'master'Achilleas Pipinellis2017-06-162-3/+2
|\ \ \
| * | | Update confidential_issues.mdconfidential-issues-redesign-docsVictor Wu2017-06-151-3/+2
| * | | Replace confidential_issues_issue_page.pngVictor Wu2017-06-151-0/+0
* | | | Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-151-2/+3
|\ \ \ \
| * | | | Update ruby metrics endpoint text to be clearerJoshua Lambert2017-06-151-2/+3
|/ / / /
* | | | Merge branch 'feature/unify-email-layouts' into 'master'Robert Speicher2017-06-1512-294/+157
|\ \ \ \
| * | | | gitlab.com contrib footer only for devise mailsAlexis Reigel2017-06-132-15/+18
| * | | | inline the only once used templateAlexis Reigel2017-06-132-5/+3
| * | | | add changelogAlexis Reigel2017-06-131-0/+4
| * | | | add contribution footer to all emailsAlexis Reigel2017-06-131-0/+16
| * | | | use common devise layout and use heading styleAlexis Reigel2017-06-1310-292/+118
| * | | | add view helper for mail headingAlexis Reigel2017-06-131-0/+13
| * | | | use common layout for devise mailerAlexis Reigel2017-06-133-23/+23
| * | | | add layout for default email contentAlexis Reigel2017-06-131-0/+3
* | | | | Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-152-1/+5
|\ \ \ \ \
| * | | | | Add a link to how to set Omnibus environment variablesStan Hu2017-06-151-0/+3
| * | | | | Rename CDN_HOST to GITLAB_CDN_HOSTStan Hu2017-06-152-2/+2
| * | | | | Document CDN_HOST in enviornment variables tableStan Hu2017-06-141-0/+1
| * | | | | Support a configurable Rails asset_host to allow for CDNsStan Hu2017-06-141-1/+1
* | | | | | Merge branch 'docs/add-link-to-migrations-spec-doc' into 'master'Grzegorz Bizon2017-06-151-1/+1
|\ \ \ \ \ \
| * | | | | | Add a link to spec/migrations/README.md in the testing documentationdocs/add-link-to-migrations-spec-docRémy Coutable2017-06-151-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'deserialize-custom-notifications' into 'master'Robert Speicher2017-06-1510-27/+284
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-159-12/+236
| * | | | | Add columns for custom notification settingsSean McGivern2017-06-154-20/+53
* | | | | | Merge branch '33614-try-to-fix-transient-failure' into 'master'Robert Speicher2017-06-151-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Try to use the same pattern as other spec in this file33614-try-to-fix-transient-failureRémy Coutable2017-06-151-2/+2
|/ / / / /
* | | | | Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master'33745-issue-closing-pattern-does-not-work-for-secondary-issues-when-using-full-urlsRémy Coutable2017-06-151-0/+12
|\ \ \ \ \
| * | | | | Language typos fixedMatej Zerovnik2017-06-121-2/+2
| * | | | | Service hostname also include registry name, when using non Docker Hub registry.Matej2017-05-261-0/+12
* | | | | | Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'Annabel Dunstone Gray2017-06-151-2/+3
|\ \ \ \ \ \
| * | | | | | Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignmentEric Eastwood2017-06-141-2/+3
View Lorry Controller Status