summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-26139-7/+286
| | | | Partially addresses #47424.
* Merge branch 'mk/fix-callback-canceling-in-namespace-move-dir' into 'master'Stan Hu2018-07-263-6/+38
|\ | | | | | | | | | | | | Fix namespace move callback behavior, especially to fix Geo replication of namespace moves during certain exceptions Closes gitlab-ee#6252 See merge request gitlab-org/gitlab-ce!19297
| * Fix namespace move callback behavior, especially to fix Geo replication of ↵Michael Kozono2018-07-263-6/+38
|/ | | | namespace moves during certain exceptions
* Merge branch '48542-code-link' into 'master'Clement Ho2018-07-262-0/+9
|\ | | | | | | | | | | | | Resolve "BS4: Link in code brackets has two different styles" Closes #48542 See merge request gitlab-org/gitlab-ce!20841
| * Resolve "BS4: Link in code brackets has two different styles"Annabel Gray2018-07-262-0/+9
|/
* Merge branch 'full-list-of-vulnerabilities-5239' into 'master'Phil Hughes2018-07-266-57/+46
|\ | | | | | | | | Full list of vulnerabilities See merge request gitlab-org/gitlab-ce!20855
| * Full list of vulnerabilitiesSam Beckham2018-07-266-57/+46
|/
* Merge branch 'remove-unnecessary-css' into 'master'Clement Ho2018-07-261-3/+0
|\ | | | | | | | | Remove CSS See merge request gitlab-org/gitlab-ce!20845
| * Remove CSSAnnabel Dunstone Gray2018-07-251-3/+0
| |
* | Merge branch 'update-danger-image' into 'master'Robert Speicher2018-07-261-4/+3
|\ \ | | | | | | | | | | | | Update the image for the 'danger-review' job See merge request gitlab-org/gitlab-ce!20856
| * | Update the image for the 'danger-review' jobRémy Coutable2018-07-261-4/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '48055-web-ide-resize-handles' into 'master'Phil Hughes2018-07-264-9/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Resize handles for Web IDE right sidebar are too thin" Closes #48055 See merge request gitlab-org/gitlab-ce!20818
| * | | Fix Web IDE editor resizing on sidebar reset sizePaul Slaughter2018-07-251-0/+7
| | | |
| * | | Update resize handle to show lighter background on hover48055-web-ide-resize-handlesPaul Slaughter2018-07-251-1/+4
| | | |
| * | | Rename 'dragleft' and 'dragright' to 'drag-left' and 'drag-right'Paul Slaughter2018-07-243-5/+5
| | | |
| * | | Rename class dragHandle to drag-handlePaul Slaughter2018-07-243-4/+4
| | | |
| * | | Resize drag handle for Web IDEPaul Slaughter2018-07-242-1/+6
| | | |
* | | | Merge branch '48636-new-mr-card-styles' into 'master'Clement Ho2018-07-263-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "BS4: Create new Merge request boxes have different styles" Closes #48636 See merge request gitlab-org/gitlab-ce!20822
| * | | | Resolve "BS4: Create new Merge request boxes have different styles"Annabel Gray2018-07-263-1/+8
|/ / / /
* | | | Merge branch '49107-prefetching-of-assets-and-cdn-domain' into 'master'Clement Ho2018-07-263-0/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DNS Prefetching + Preconnect of assets_host (CDN Domain) Closes #49107 See merge request gitlab-org/gitlab-ce!20781
| * | | | DNS Prefetching + Preconnect of assets_host (CDN Domain)Tim Zallmann2018-07-263-0/+43
|/ / / /
* | | | Merge branch 'ide-delete-entries' into 'master'Tim Zallmann2018-07-2636-116/+545
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Enable deleting files in the Web IDE See merge request gitlab-org/gitlab-ce!20595
| * | | Enable deleting files in the Web IDEPhil Hughes2018-07-2636-116/+545
|/ / /
* | | Merge branch '49614-dynamic-component-in-report-issue' into 'master'Phil Hughes2018-07-268-60/+110
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make report_issues.vue easily extendable Closes #49614 See merge request gitlab-org/gitlab-ce!20843
| * | | Make report_issues.vue easily extendableLukas Eipert2018-07-268-60/+110
|/ / /
* | | Merge branch 'wrap-job-name-on-jobs-sidebar' into 'master'Tim Zallmann2018-07-262-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Wrap job name on pipeline job sidebar Closes #49540 See merge request gitlab-org/gitlab-ce!20804
| * | | Wrap job name on pipeline job sidebarGeorge Tsiolis2018-07-242-0/+6
| | | |
* | | | Merge branch 'winh-fail-slow-karma-tests' into 'master'Tim Zallmann2018-07-261-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail Karma tests that take longer than a second Closes #44174 See merge request gitlab-org/gitlab-ce!20518
| * | | | Fail Karma tests that take longer than a secondWinnie Hellmann2018-07-231-0/+13
| | | | |
* | | | | Merge branch 'sh-bump-haml-5.0.4' into 'master'Rémy Coutable2018-07-262-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump haml gem to 5.0.4 See merge request gitlab-org/gitlab-ce!20847
| * | | | | Bump haml gem to 5.0.4Stan Hu2018-07-252-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in #49625, this version is needed to support Ruby 2.5. See https://github.com/haml/haml/blob/master/CHANGELOG.md for more details.
* | | | | | Merge branch '49631-fix-dangerfile-schema-rb' into 'master'Rémy Coutable2018-07-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Dangerfile reporting that db/schema.rb wasn't updated" Closes #49631 See merge request gitlab-org/gitlab-ce!20852
| * | | | | | Fix regexp for detected `db/schema.rb` and `ee/db/geo/schema.rb`Thong Kuah2018-07-261-2/+2
| | | | | | |
* | | | | | | Merge branch 'ce-5158-metrics-alerting' into 'master'Sean McGivern2018-07-2616-55/+141
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 5158-metrics-alerting to CE See merge request gitlab-org/gitlab-ce!20148
| * | | | | | | Updates CE backportce-5158-metrics-alertingTiago Botelho2018-07-253-8/+12
| | | | | | | |
| * | | | | | | Move kubeclient and namespace variables to the private interfaceTiago Botelho2018-07-252-3/+3
| | | | | | | |
| * | | | | | | Backports relevant changes made in ↵Tiago Botelho2018-07-2516-54/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5163 to CE
* | | | | | | | Merge branch 'ide-edit-json-files' into 'master'Tim Zallmann2018-07-263-2/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed IDE not opening JSON files See merge request gitlab-org/gitlab-ce!20798
| * | | | | | | | Fixed IDE not opening JSON filesPhil Hughes2018-07-263-2/+24
|/ / / / / / / /
* | | | | | | | Merge branch 'tz-move-repo-css' into 'master'Phil Hughes2018-07-263-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved repo.css to its own CSS bundle to reduce the size of the main bundle See merge request gitlab-org/gitlab-ce!20853
| * | | | | | | | Moved repo.css to its own CSS bundle to reduce the size of the main bundleTim Zallmann2018-07-263-0/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'gitlab-qa-reset-local-store' into 'master'Rémy Coutable2018-07-261-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset local storage between qa tests Closes gitlab-qa#303 See merge request gitlab-org/gitlab-ce!20844
| * | | | | | | | Reset local storage between qa testsDJ Mountney2018-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not done by default as it is said to incur a performance hit, paired with local storage not always being used by the site being tested. (https://github.com/teamcapybara/capybara/issues/1702#issuecomment-219483444) GitLab uses localStorage, for things like remembering which tab you used last (on the login page for example, between sign-in, ldap, and register) Fixes: https://gitlab.com/gitlab-org/gitlab-qa/issues/303
* | | | | | | | | Merge branch '31576-redirect-commits-to-root-if-no-ref' into 'master'Douwe Maan2018-07-264-3/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Define /commits/ behaviour" Closes #31576 See merge request gitlab-org/gitlab-ce!20738
| * | | | | | | | | Remove before hook for specKia Mei Somabes2018-07-251-3/+1
| | | | | | | | | |
| * | | | | | | | | Transfer to commits_controller, add test, and update changelogKia Mei Somabes2018-07-245-9/+23
| | | | | | | | | |
| * | | | | | | | | Change hash syntax for redirect commits to root if no ref is providedKia Mei Somabes2018-07-231-1/+1
| | | | | | | | | |
| * | | | | | | | | Redirect commits to root_ref if no ref is providedKia Mei Somabes2018-07-203-0/+10
| | | | | | | | | |
* | | | | | | | | | Merge branch 'bvl-graphql-wip-mutation' into 'master'Douwe Maan2018-07-2623-15/+686
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toggle wip status using GraphQL mutation Closes #48719 See merge request gitlab-org/gitlab-ce!20443
| * | | | | | | | | | Add mutation toggling WIP state of merge requestsBob Van Landuyt2018-07-2523-15/+686
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly the setup of mutations for GraphQL. Including authorization and basic return type-structure.