Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-... | Pawel Chojnacki | 2017-06-16 | 1189 | -7088/+21912 |
|\ | |||||
| * | Merge branch 'docs/branches' into 'master' | Marcia Ramos | 2017-06-16 | 5 | -0/+24 |
| |\ | |||||
| | * | Move branches docs to new location and copyeditdocs/branches | Achilleas Pipinellis | 2017-06-16 | 4 | -7/+9 |
| | * | Document the Delete Merged Branches functionality | Mark Fletcher | 2017-06-08 | 5 | -0/+22 |
| * | | Merge branch '31415-responsive-pipelines-table-2' into 'master' | Phil Hughes | 2017-06-16 | 20 | -418/+332 |
| |\ \ | |||||
| | * | | Create responsive mobile view for pipelines table | Annabel Dunstone Gray | 2017-06-16 | 20 | -418/+332 |
| |/ / | |||||
| * | | Merge branch 'translation/9.3/french' into 'master' | Rémy Coutable | 2017-06-16 | 5 | -0/+213 |
| |\ \ | |||||
| | * | | Adding changelog | Erwan GEORGET | 2017-06-15 | 1 | -0/+4 |
| | * | | Add French translations for Cycle Analytics, Project, and Repository pages. | Erwan GEORGET | 2017-06-15 | 4 | -0/+209 |
| * | | | Merge branch 'speed-up-graphs' into 'master' | Rémy Coutable | 2017-06-16 | 2 | -0/+29 |
| |\ \ \ | |||||
| | * | | | Speed up used languages calculation on charts page | Sean McGivern | 2017-06-16 | 2 | -0/+29 |
| * | | | | Merge branch 'set_proper_defaults_for_metric_paths' into 'master' | Robert Speicher | 2017-06-16 | 2 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru | Pawel Chojnacki | 2017-06-15 | 2 | -3/+3 |
| * | | | | | Merge branch 'sh-fix-issue-33756' into 'master' | Rémy Coutable | 2017-06-16 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Avoid including Capybara::DSL to conflict with definition of pagesh-fix-issue-33756 | Stan Hu | 2017-06-15 | 1 | -5/+3 |
| | * | | | | | Don't include Capybara::DSL in the global scope | Stan Hu | 2017-06-15 | 2 | -1/+2 |
| | * | | | | | Add Capybara DSL for JavaScript specs to get page helper | Stan Hu | 2017-06-15 | 1 | -0/+1 |
| | * | | | | | Wait for all Ajax and Vue requests to complete in JavaScript tests | Stan Hu | 2017-06-15 | 1 | -1/+1 |
| * | | | | | | Merge branch 'convdev-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 3 | -1/+31 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Copyedit ConvDev docsconvdev-docs | Achilleas Pipinellis | 2017-06-16 | 3 | -12/+20 |
| | * | | | | | convdev docs | Victor Wu | 2017-06-15 | 1 | -0/+22 |
| * | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2017-06-16 | 1 | -24/+24 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Clarify job choosing algorithm examples (the language used was a bit hard to ... | Joe Marty | 2017-06-15 | 1 | -24/+24 |
| * | | | | | | | Merge branch 'backport-ee-cache-invalidation-to-ce' into 'master' | Rémy Coutable | 2017-06-16 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use the same way to invalidate cache in EEbackport-ee-cache-invalidation-to-ce | Lin Jen-Shin | 2017-06-15 | 1 | -2/+3 |
| * | | | | | | | | Merge branch 'fix-group-url' into 'master' | Dmitriy Zaporozhets | 2017-06-16 | 4 | -4/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Expose correct path to group | Alfredo Sumaran | 2017-06-16 | 4 | -4/+13 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'sh-improve-pipelines-finder-spec' into 'master' | Grzegorz Bizon | 2017-06-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix intermittent spec failures in spec/finders/pipelines_finder_spec.rbsh-improve-pipelines-finder-spec | Stan Hu | 2017-06-15 | 1 | -1/+1 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Update CHANGELOG.md for 9.2.6 | Timothy Andrew | 2017-06-16 | 13 | -48/+15 |
| * | | | | | | | | Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-margin | Tim Zallmann | 2017-06-16 | 13 | -249/+137 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | fix frontend test failures after jasmine upgradekarma-headless-chrome-redux | Mike Greiling | 2017-06-15 | 2 | -3/+3 |
| | * | | | | | | | | remove debug flag, but continue to log chrome output | Mike Greiling | 2017-06-14 | 1 | -1/+1 |
| | * | | | | | | | | upgrade jasmine to attempt to resolve browser timeout issues | Mike Greiling | 2017-06-14 | 2 | -17/+11 |
| | * | | | | | | | | add DEBUG flag option to karma config | Mike Greiling | 2017-06-14 | 2 | -6/+20 |
| | * | | | | | | | | run chrome with --no-sandbox flag to get around docker privilege limitations | Mike Greiling | 2017-06-14 | 2 | -7/+5 |
| | * | | | | | | | | upgrade karma to v1.7.0 | Mike Greiling | 2017-06-14 | 2 | -72/+70 |
| | * | | | | | | | | force chrome to produce debug output as it runs in CI | Mike Greiling | 2017-06-14 | 2 | -1/+12 |
| | * | | | | | | | | add CHANGELOG.md entry for !12036 | Mike Greiling | 2017-06-14 | 1 | -0/+4 |
| | * | | | | | | | | remove phantomjs-specific test hacks | Mike Greiling | 2017-06-14 | 5 | -50/+10 |
| | * | | | | | | | | update karma job to use chrome build image created by gitlab-build-images!41 | Mike Greiling | 2017-06-14 | 1 | -1/+1 |
| | * | | | | | | | | test new docker image with headless chrome | Mike Greiling | 2017-06-14 | 1 | -0/+1 |
| | * | | | | | | | | remove phantomjs from our frontend dev dependencies | Mike Greiling | 2017-06-14 | 2 | -118/+8 |
| | * | | | | | | | | fix incorrect equals assertion | Mike Greiling | 2017-06-14 | 1 | -1/+1 |
| | * | | | | | | | | replace PhantomJS with headless Chrome as karma test runner | Mike Greiling | 2017-06-14 | 3 | -2/+20 |
| * | | | | | | | | | Merge branch 'issue-board-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update issue_board.mdissue-board-docs | Victor Wu | 2017-06-15 | 1 | -2/+3 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'jira-integ-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Jira integ docs | Victor Wu | 2017-06-16 | 2 | -3/+3 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'confidential-issues-redesign-docs' into 'master' | Achilleas Pipinellis | 2017-06-16 | 2 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | |