| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove old specs and add new ones | Felipe Artur | 2017-06-16 | 7 | -39/+44 |
| | | |||||
| * | Order merge requests by priority | Felipe Artur | 2017-06-16 | 8 | -156/+10 |
| | | |||||
| * | Order issues by priority | Felipe Artur | 2017-06-16 | 7 | -16/+18 |
| | | |||||
| * | Remove Drag and drop and sorting from milestone view | Felipe Artur | 2017-06-16 | 9 | -153/+87 |
| | | |||||
| * | Merge branch 'docs/branches' into 'master' | Marcia Ramos | 2017-06-16 | 5 | -0/+24 |
| |\ | | | | | | | | | Document the Delete Merged Branches functionality See merge request !12217 | ||||
| | * | 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 |
| | | | | | | | | | * Note that protected branches will not be part of the deletion | ||||
| * | | Merge branch '31415-responsive-pipelines-table-2' into 'master' | Phil Hughes | 2017-06-16 | 20 | -418/+332 |
| |\ \ | | | | | | | | | | | | | | | | | | | Create responsive mobile view for pipelines table Closes #31415 See merge request !12171 | ||||
| | * | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | Add French translations for Cycle Analytics, Project, and Repository pages. Closes #32998 and #33140 See merge request !12200 | ||||
| | * | | 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 See merge request !12212 | ||||
| | * | | | Speed up used languages calculation on charts page | Sean McGivern | 2017-06-16 | 2 | -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 Speicher | 2017-06-16 | 2 | -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.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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Pipinellis | 2017-06-16 | 3 | -1/+31 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Convdev docs See merge request !12189 | ||||
| | * | | | | | 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 selection algorithm docs See merge request !12199 | ||||
| | * | | | | | | Clarify job choosing algorithm examples (the language used was a bit hard to ↵ | Joe Marty | 2017-06-15 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | understand) | ||||
| * | | | | | | | 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 from EE See merge request !12187 | ||||
| | * | | | | | | | Use the same way to invalidate cache in EEbackport-ee-cache-invalidation-to-ce | Lin Jen-Shin | 2017-06-15 | 1 | -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 Zaporozhets | 2017-06-16 | 4 | -4/+13 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose correct path to group See merge request !12176 | ||||
| | * | | | | | | | | 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.rb See merge request !12207 | ||||
| | * | | | | | | | | Fix intermittent spec failures in spec/finders/pipelines_finder_spec.rbsh-improve-pipelines-finder-spec | Stan Hu | 2017-06-15 | 1 | -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.6 | Timothy Andrew | 2017-06-16 | 13 | -48/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | | | | Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-margin | Tim Zallmann | 2017-06-16 | 13 | -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-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 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue board docs See merge request !12197 | ||||
| | * | | | | | | | | | Update issue_board.mdissue-board-docs | Victor Wu | 2017-06-15 | 1 | -2/+3 |
| | | |_|_|/ / / / / | |/| | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |