summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-166-16/+138
|
* Merge branch '31415-responsive-pipelines-table-2' into 'master'Phil Hughes2017-06-1620-418/+332
|\ | | | | | | | | | | | | Create responsive mobile view for pipelines table Closes #31415 See merge request !12171
| * 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
|\ | | | | | | | | | | | | Add French translations for Cycle Analytics, Project, and Repository pages. Closes #32998 and #33140 See merge request !12200
| * 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 page See merge request !12212
| * | Speed up used languages calculation on charts pageSean McGivern2017-06-162-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed calls from our code to Rugged::Repository#fetch_attributes: <https://gitlab.com/gitlab-org/gitlab_git/commit/340e111e040ae847b614d35b4d3173ec48329015> However, we didn't remove calls from within Linguist. This method is only called when calculating the languages for a repository on the Charts page: <https://github.com/github/linguist/blob/v4.7.0/lib/linguist/lazy_blob.rb#L33-L36> We can safely use our own Gitlab::Git::Attributes here. On staging, for the GitLab CE repo, this makes the calculation take about a third of the time: # Before Benchmark.realtime do Linguist::Repository.new(repository.rugged, repository.rugged.head.target_id).languages end #=> 23.67193900188431 # After Benchmark.realtime do Linguist::Repository.new(repository.rugged, repository.rugged.head.target_id).languages end #=> 8.945212290156633
* | | 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.ru See merge request !12201
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for all Ajax and Vue requests to complete in JavaScript tests Closes #33756 See merge request !12203
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From logs in #33756, we that it's possible for an Ajax call to be made before the middleware receives it. To prevent stray Ajax calls from breaking other specs, we need to wait for all scheduled calls to finish. Closes #33756
* | | | | Merge branch 'convdev-docs' into 'master'Achilleas Pipinellis2017-06-163-1/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Convdev docs See merge request !12189
| * | | | 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 selection algorithm docs See merge request !12199
| * | | | | Clarify job choosing algorithm examples (the language used was a bit hard to ↵Joe Marty2017-06-151-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | understand)
* | | | | | Merge branch 'backport-ee-cache-invalidation-to-ce' into 'master'Rémy Coutable2017-06-161-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same way to invalidate cache from EE See merge request !12187
| * | | | | | Use the same way to invalidate cache in EEbackport-ee-cache-invalidation-to-ceLin Jen-Shin2017-06-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because it doesn't really hurt and could reduce conflicts Discussion: https://gitlab.com/gitlab-org/gitlab-ee/commit/5020e1a779cecbf16fffa3b37726b9167093126c#note_32403646
* | | | | | | Merge branch 'fix-group-url' into 'master'Dmitriy Zaporozhets2017-06-164-4/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose correct path to group See merge request !12176
| * | | | | | | 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.rb See merge request !12207
| * | | | | | | Fix intermittent spec failures in spec/finders/pipelines_finder_spec.rbsh-improve-pipelines-finder-specStan Hu2017-06-151-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The spec was trying to sort pipelines by user ID, but the same user ID was being used for each pipeline in the spec. This is similar to #33001.
* | | | | | | Update CHANGELOG.md for 9.2.6Timothy Andrew2017-06-1613-48/+15
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-marginTim Zallmann2017-06-1613-249/+137
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace PhantomJS with Chrome in Karma test runner (2nd attempt) Closes #33633 See merge request !12144
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue board docs See merge request !12197
| * | | | | | | | 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 docs See merge request !12196
| * | | | | | | | Jira integ docsVictor Wu2017-06-162-3/+3
|/ / / / / / / /
* | | | | | | | Merge branch 'confidential-issues-redesign-docs' into 'master'Achilleas Pipinellis2017-06-162-3/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Confidential issues redesign docs See merge request !12195
| * | | | | | | 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 clearer See merge request !12157
View Lorry Controller Status