Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove method wrapper around Build27724-fe-update-trace-handling-code-against-9-0-stable-delete27724-fe-update-trace-handling-code-against-9-0-stable | Alfredo Sumaran | 2017-04-07 | 1 | -286/+285 |
| | |||||
* | Fix Karma specs | Alfredo Sumaran | 2017-04-07 | 1 | -21/+27 |
| | |||||
* | Fix broken tests. | Filipa Lacerda | 2017-04-07 | 4 | -78/+67 |
| | | | | Changes after review | ||||
* | Use boostrap affix instead of changing position manually. | Filipa Lacerda | 2017-04-07 | 3 | -19/+20 |
| | | | | | Update size according to received one Only show truncated info when append is false | ||||
* | Follow eslint rules | Filipa Lacerda | 2017-04-07 | 2 | -57/+69 |
| | | | | | | Fix linter errors Improve UX | ||||
* | Update to match new API - merges the two requests and adds truncated ↵ | Filipa Lacerda | 2017-04-07 | 3 | -74/+135 |
| | | | | | | | information when provided # Conflicts: # app/assets/javascripts/build.js | ||||
* | Add missing tests for all new features | Kamil Trzcinski | 2017-04-07 | 6 | -123/+361 |
| | |||||
* | Fix failures | Kamil Trzcinski | 2017-04-07 | 3 | -13/+9 |
| | |||||
* | Another set of tests to run | Kamil Trzcinski | 2017-04-07 | 5 | -187/+236 |
| | |||||
* | Fix some failures | Kamil Trzcinski | 2017-04-07 | 2 | -6/+5 |
| | |||||
* | Fix problem | Kamil Trzcinski | 2017-04-07 | 1 | -2/+2 |
| | |||||
* | Fix most test failures | Kamil Trzcinski | 2017-04-07 | 14 | -211/+257 |
| | |||||
* | Fix some failures | Kamil Trzcinski | 2017-04-07 | 3 | -25/+23 |
| | | | | | # Conflicts: # app/models/ci/build.rb | ||||
* | Hide secrets | Kamil Trzcinski | 2017-04-07 | 1 | -0/+1 |
| | |||||
* | Introduce Trace::Stream class and refactor all calls | Kamil Trzcinski | 2017-04-07 | 14 | -159/+203 |
| | |||||
* | Update to match new API - merges the two requests and adds truncated ↵ | Filipa Lacerda | 2017-04-07 | 1 | -3/+3 |
| | | | | information when provided | ||||
* | Fix extract_coverage | Kamil Trzcinski | 2017-04-07 | 1 | -1/+1 |
| | |||||
* | Introduce TraceStream class | Kamil Trzcinski | 2017-04-07 | 6 | -130/+186 |
| | |||||
* | Optimise trace handling code to use streaming instead of full read | Kamil Trzcinski | 2017-04-07 | 9 | -228/+230 |
| | | | | | # Conflicts: # app/assets/javascripts/build.js | ||||
* | Merge branch 'mr-shortcuts-counter' into '9-0-stable' | Jacob Schatz | 2017-04-07 | 11 | -72/+108 |
|\ | | | | | | | | | MR shortcuts counter for stable See merge request !10497 | ||||
| * | MR shortcuts counter for stable | Sam Rose | 2017-04-07 | 11 | -72/+108 |
|/ | |||||
* | Merge branch 'sh-fix-ssh-keys-with-spaces' into 'master' | Sean McGivern | 2017-04-07 | 3 | -1/+14 |
| | | | | | Handle SSH keys that have multiple spaces between each marker See merge request !10466 | ||||
* | Update VERSION to 9.0.4v9.0.4 | DJ Mountney | 2017-04-05 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.0.4 | DJ Mountney | 2017-04-05 | 6 | -21/+8 |
| | | | [ci skip] | ||||
* | Merge branch 'open-redirect-fix-continue-to' into 'security' | Sean McGivern | 2017-04-05 | 3 | -1/+13 |
| | | | | | Fix for open redirect vuln involving continue[to] params See merge request !2083 | ||||
* | Merge branch 'open-redirect-host-fix' into 'security' | Sean McGivern | 2017-04-05 | 7 | -3/+37 |
| | | | | | Fix for three open redirect vulns using redirect_to url_for(params.merge))) See merge request !2082 | ||||
* | Merge branch 'path-disclosure-proj-import-export' into 'security' | DJ Mountney | 2017-04-05 | 3 | -1/+17 |
| | | | | | Fix for path disclosure in project import/export See merge request !2080 | ||||
* | Merge branch '29364-private-projects-mr-fix' into 'security' | Sean McGivern | 2017-04-05 | 4 | -2/+60 |
| | | | | | Don’t show source project name when user does not have access See merge request !2081 | ||||
* | Merge branch '30125-markdown-security' into 'security' | Robert Speicher | 2017-04-05 | 10 | -36/+68 |
| | | | | | Remove class from SanitizationFilter whitelist See merge request !2079 | ||||
* | Update VERSION to 9.0.3v9.0.3 | James Lopez | 2017-04-05 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG.md for 9.0.3 | James Lopez | 2017-04-05 | 15 | -58/+17 |
| | | | [ci skip] | ||||
* | Merge branch '30284-fix-repo-clean-rules' into 'master' | Robert Speicher | 2017-04-04 | 1 | -1/+1 |
| | | | | | | | Don't clean up the gitlab-test-fork_bare repo Closes #30284 See merge request !10342 | ||||
* | Merge branch 'backport-sticking-api-helper-changes' into 'master' | Kamil Trzciński | 2017-04-04 | 5 | -22/+24 |
| | | | | | Backport API changes needed to fix sticking in EE See merge request !10376 | ||||
* | Merge branch ↵ | James Lopez | 2017-04-04 | 10 | -147/+217 |
|\ | | | | | | | | | | | | | | | '29539-fix-pipelines-container-width-with-parallel-diff-for-9-0-stable-merge' into '9-0-stable' Reset container width when switching to pipelines MR tab -- `9-0-stable` merge edition See merge request !10424 | ||||
| * | Reset container width when switching to pipelines MR tab29539-fix-pipelines-container-width-with-parallel-diff-for-9-0-stable-merge | Eric Eastwood | 2017-04-03 | 10 | -147/+217 |
| | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539 Conflicts: app/assets/javascripts/commit/pipelines/pipelines_table.js app/assets/javascripts/merge_request_tabs.js spec/javascripts/commit/pipelines/pipelines_spec.js | ||||
* | | Fix bad merge of one of the spec files | DJ Mountney | 2017-04-03 | 1 | -2/+2 |
| | | |||||
* | | Merge branch '29541-fix-github-importer-deleted-fork' into 'master' | Robert Speicher | 2017-04-03 | 5 | -23/+73 |
| | | | | | | | | | | | | | | | | Fix GitHub importer for PRs of deleted forked repositories Closes #29541 See merge request !9992 | ||||
* | | Merge branch '29034-fix-github-importer' into 'master' | Douwe Maan | 2017-04-03 | 3 | -1/+41 |
| | | | | | | | | | | | | | | | | Fix name colision when importing GitHub pull requests from forked repositories Closes #29034 See merge request !9719 | ||||
* | | Merge branch '30264-fix-vue-pagination' into 'master' | Fatih Acet | 2017-04-03 | 5 | -10/+79 |
| | | | | | | | | | | | | | | Fixes method not replacing URL parameters correctly Closes #30264 See merge request !10351 | ||||
* | | Merge branch 'sh-fix-destroy-user-race' into 'master' | Douwe Maan | 2017-04-03 | 7 | -12/+48 |
| | | | | | | | | | | | | | | Fix race condition where a namespace would be deleted before a project was deleted Closes #30334 and #30306 See merge request !10389 | ||||
* | | Merge branch 'todo-update-order' into 'master' | Yorick Peterse | 2017-04-03 | 2 | -1/+5 |
| | | | | | | | | | | | | Remove unnecessary ORDER BY clause when updating todos See merge request !10399 | ||||
* | | Merge branch 'issuable-sidebar-collapsed-labels-icon' into 'master' | Filipa Lacerda | 2017-04-03 | 2 | -1/+7 |
| | | | | | | | | | | | | | | Fixed labels icon being hidden in collapsed issuable sidebar Closes #29751 See merge request !10107 | ||||
* | | Merge branch 'tc-api-remove-comments-endpoint' into 'master' | Rémy Coutable | 2017-04-03 | 7 | -148/+68 |
| | | | | | | | | | | | | | | API: Make the /notes endpoint work with noteable iid instead of id Closes #29871 See merge request !10258 | ||||
* | | Merge branch 'forked-subquery-order' into 'master' | Yorick Peterse | 2017-04-03 | 2 | -2/+8 |
|/ | | | | | Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery See merge request !10334 | ||||
* | Merge branch 'fix/gb/environments-folders-route' into 'master' | Kamil Trzciński | 2017-04-03 | 5 | -1/+106 |
| | | | | | | | Fix environment folder route when special chars present Closes #29922 See merge request !10250 | ||||
* | Merge branch '30063-builds-sidebar-stutter' into 'master' | Filipa Lacerda | 2017-04-03 | 1 | -1/+1 |
| | | | | | | | Add subnav height to sidebar scroll calculation Closes #30063 See merge request !10262 | ||||
* | Merge branch ↵ | Yorick Peterse | 2017-04-03 | 4 | -2/+57 |
| | | | | | | | | | | '30098-banzai-filter-mergerequestreferencefilter-has-an-n-1-query-problem' into 'master' Resolve "Banzai::Filter::MergeRequestReferenceFilter has three N+1 query problems" Closes #30098 See merge request !10252 | ||||
* | Merge branch '30289-allow-users-to-import-github-projects-to-subgroups' into ↵ | Robert Speicher | 2017-04-03 | 3 | -1/+19 |
| | | | | | | | | | | 'master' Allow users to import GitHub projects to subgroups Closes #30289 and #30148 See merge request !10344 | ||||
* | Merge branch '30276-move-top-badges' into 'master' | Annabel Dunstone Gray | 2017-04-03 | 2 | -5/+9 |
| | | | | | | | 30276 Move issue, mr, todos next to profile dropdown in top nav Closes #30276 See merge request !10347 | ||||
* | Merge branch ↵ | Rémy Coutable | 2017-04-03 | 3 | -7/+7 |
| | | | | | | | | | | '29874-support-wider-range-of-monitored-environments-with-prometheus' into 'master' Support wider range of monitored environments with Prometheus Closes #29874 See merge request !10159 |