summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refactor project_title_spec.js and fix transient spec failureincrease-karma-socket-timeoutMike Greiling2017-06-161-36/+40
* increase karma's no activity timeout to 60 seconds when generating code cover...Mike Greiling2017-06-161-0/+1
* add hack to force chrome to release the main thread during a long sequence of...Mike Greiling2017-06-161-0/+8
* Merge branch 'docs/branches' into 'master'Marcia Ramos2017-06-165-0/+24
|\
| * Move branches docs to new location and copyeditdocs/branchesAchilleas Pipinellis2017-06-164-7/+9
| * Document the Delete Merged Branches functionalityMark Fletcher2017-06-085-0/+22
* | Merge branch '31415-responsive-pipelines-table-2' into 'master'Phil Hughes2017-06-1620-418/+332
|\ \
| * | Create responsive mobile view for pipelines tableAnnabel Dunstone Gray2017-06-1620-418/+332
|/ /
* | Merge branch 'translation/9.3/french' into 'master'Rémy Coutable2017-06-165-0/+213
|\ \
| * | Adding changelogErwan GEORGET2017-06-151-0/+4
| * | Add French translations for Cycle Analytics, Project, and Repository pages.Erwan GEORGET2017-06-154-0/+209
* | | Merge branch 'speed-up-graphs' into 'master'Rémy Coutable2017-06-162-0/+29
|\ \ \
| * | | Speed up used languages calculation on charts pageSean McGivern2017-06-162-0/+29
* | | | Merge branch 'set_proper_defaults_for_metric_paths' into 'master'Robert Speicher2017-06-162-3/+3
|\ \ \ \
| * | | | set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ruPawel Chojnacki2017-06-152-3/+3
* | | | | Merge branch 'sh-fix-issue-33756' into 'master'Rémy Coutable2017-06-161-4/+4
|\ \ \ \ \
| * | | | | Avoid including Capybara::DSL to conflict with definition of pagesh-fix-issue-33756Stan Hu2017-06-151-5/+3
| * | | | | Don't include Capybara::DSL in the global scopeStan Hu2017-06-152-1/+2
| * | | | | Add Capybara DSL for JavaScript specs to get page helperStan Hu2017-06-151-0/+1
| * | | | | Wait for all Ajax and Vue requests to complete in JavaScript testsStan Hu2017-06-151-1/+1
* | | | | | Merge branch 'convdev-docs' into 'master'Achilleas Pipinellis2017-06-163-1/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Copyedit ConvDev docsconvdev-docsAchilleas Pipinellis2017-06-163-12/+20
| * | | | | convdev docsVictor Wu2017-06-151-0/+22
* | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-06-161-24/+24
|\ \ \ \ \ \
| * | | | | | Clarify job choosing algorithm examples (the language used was a bit hard to ...Joe Marty2017-06-151-24/+24
* | | | | | | Merge branch 'backport-ee-cache-invalidation-to-ce' into 'master'Rémy Coutable2017-06-161-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Use the same way to invalidate cache in EEbackport-ee-cache-invalidation-to-ceLin Jen-Shin2017-06-151-2/+3
* | | | | | | | Merge branch 'fix-group-url' into 'master'Dmitriy Zaporozhets2017-06-164-4/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Expose correct path to groupAlfredo Sumaran2017-06-164-4/+13
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-improve-pipelines-finder-spec' into 'master'Grzegorz Bizon2017-06-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix intermittent spec failures in spec/finders/pipelines_finder_spec.rbsh-improve-pipelines-finder-specStan Hu2017-06-151-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Update CHANGELOG.md for 9.2.6Timothy Andrew2017-06-1613-48/+15
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \
View Lorry Controller Status