Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Chmod 644 on offending filesdocs/fix-chmod | Achilleas Pipinellis | 2018-05-18 | 3 | -0/+0 |
| | |||||
* | Merge branch 'docs/incremental-rollouts' into 'master' | Achilleas Pipinellis (🌴 May 18 - May 21 🌴) | 2018-05-18 | 5 | -0/+52 |
|\ | | | | | | | | | | | | | Add docs for incremental rollouts Closes gitlab-ee#5925 See merge request gitlab-org/gitlab-ce!18978 | ||||
| * | Add docs for incremental rolloutsdocs/incremental-rollouts | Achilleas Pipinellis | 2018-05-18 | 5 | -0/+52 |
| | | |||||
* | | Merge branch 'zj-calculate-checksum-mandator' into 'master' | Nick Thomas | 2018-05-18 | 3 | -86/+35 |
|\ \ | | | | | | | | | | | | | | | | | | | Calculating repository checksums executed by Gitaly Closes gitaly#1105 and #46293 See merge request gitlab-org/gitlab-ce!18907 | ||||
| * | | Calculating repository checksums executed by Gitaly | Zeger-Jan van de Weg | 2018-05-18 | 3 | -86/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | OPT_OUT status has been removed, and alternative implementation removed. Also checks if the repository exists before executing the checksum RPC to guard against NotFound errors. Closes gitlab-org/gitaly#1105 | ||||
* | | | Merge branch 'memoize-database-version' into 'master' | Rémy Coutable | 2018-05-18 | 3 | -1/+20 |
|\ \ \ | | | | | | | | | | | | | | | | | Memoize Gitlab::Database.version See merge request gitlab-org/gitlab-ce!19021 | ||||
| * | | | Memoize Gitlab::Database.versionmemoize-database-version | Yorick Peterse | 2018-05-17 | 3 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | This removes the need for running a database query every time we want to check the database version. | ||||
* | | | | Merge branch 'dz-refactor-lists-css' into 'master' | Annabel Gray | 2018-05-18 | 2 | -228/+228 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Move group lists css from framework/lists.scss to pages/groups.scss See merge request gitlab-org/gitlab-ce!19027 | ||||
| * | | | | Move group lists css from framework/lists.scss to pages/groups.scssdz-refactor-lists-css | Dmitriy Zaporozhets | 2018-05-18 | 2 | -228/+228 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'ide-sidebar-spacing' into 'master' | Filipa Lacerda | 2018-05-18 | 4 | -45/+63 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed inconsistent spacing in web IDE sidebar Closes #46162 See merge request gitlab-org/gitlab-ce!18827 | ||||
| * | | | | | fixed up spacing above & below listside-sidebar-spacing | Phil Hughes | 2018-05-17 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | fixed `no changes` spacing | ||||
| * | | | | | fixed spacing of icon & dropdown button | Phil Hughes | 2018-05-10 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | changed padding in headers | Phil Hughes | 2018-05-09 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | fixed up spacing throughout sidebars | Phil Hughes | 2018-05-09 | 4 | -43/+56 |
| | | | | | | |||||
| * | | | | | Fixed inconsistent spacing in web IDE sidebar | Phil Hughes | 2018-05-09 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #46162 | ||||
* | | | | | | Merge branch 'winh-vuex-createStore-docs' into 'master' | Phil Hughes | 2018-05-18 | 1 | -2/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make stores export a createStore() which can be used in tests See merge request gitlab-org/gitlab-ce!19030 | ||||
| * | | | | | | Make stores export a createStore() which can be used in testswinh-vuex-createStore-docs | Winnie Hellmann | 2018-05-18 | 1 | -2/+6 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master' | Kamil Trzciński | 2018-05-18 | 18 | -56/+431 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for variables expression regexp syntax Closes #43601 See merge request gitlab-org/gitlab-ce!18902 | ||||
| * | | | | | | | Simplify pattern lexeme fabrication and matcherfeature/gb/add-regexp-variables-expression | Grzegorz Bizon | 2018-05-18 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Simplify untrusted regexp factory method | Grzegorz Bizon | 2018-05-18 | 4 | -21/+16 |
| | | | | | | | | |||||
| * | | | | | | | Update variables expressions statement specs | Grzegorz Bizon | 2018-05-17 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update variables expressions pattern matching docs | Grzegorz Bizon | 2018-05-17 | 1 | -7/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add variables expression pattern validation support | Grzegorz Bizon | 2018-05-17 | 3 | -1/+20 |
| | | | | | | | | |||||
| * | | | | | | | Add anti-corruption layer above expressions pattern matching | Grzegorz Bizon | 2018-05-17 | 2 | -2/+30 |
| | | | | | | | | |||||
| * | | | | | | | Add extended /regexp/ scheme support to untrusted regexp | Grzegorz Bizon | 2018-05-17 | 2 | -1/+71 |
| | | | | | | | | |||||
| * | | | | | | | Make variables expression pattern case-sensitivity explicit | Grzegorz Bizon | 2018-05-15 | 3 | -0/+22 |
| | | | | | | | | |||||
| * | | | | | | | Add docs on pattern matching syntax in variables expression | Grzegorz Bizon | 2018-05-15 | 2 | -1/+19 |
| | | | | | | | | |||||
| * | | | | | | | Remove useless assignment in pattern lexeme | Grzegorz Bizon | 2018-05-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add variables expressions regexp support changelog | Grzegorz Bizon | 2018-05-15 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Do not support inverse variable pattern matching | Grzegorz Bizon | 2018-05-15 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Use parameterized RSpec to improve variables expressions specs | Grzegorz Bizon | 2018-05-15 | 1 | -43/+44 |
| | | | | | | | | |||||
| * | | | | | | | Add support for pattern matching in variables expressions | Grzegorz Bizon | 2018-05-15 | 7 | -7/+27 |
| | | | | | | | | |||||
| * | | | | | | | Reorganize exceptions in pipeline expressions module | Grzegorz Bizon | 2018-05-15 | 8 | -16/+23 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into feature/gb/add-regexp-variables-expression | Grzegorz Bizon | 2018-05-15 | 163 | -3833/+2120 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Conflicts: lib/gitlab/untrusted_regexp.rb | ||||
| * | | | | | | | | Add pattern matching variables expression lexeme | Grzegorz Bizon | 2018-05-14 | 2 | -0/+86 |
| | | | | | | | | | |||||
| * | | | | | | | | Raise variables statement exception if pattern is invalid | Grzegorz Bizon | 2018-05-14 | 5 | -6/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Do not raise if variable expression can not be evaluated | Grzegorz Bizon | 2018-05-14 | 2 | -2/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement variables expression untrusted pattern lexeme | Grzegorz Bizon | 2018-05-11 | 2 | -0/+81 |
| | | | | | | | | | |||||
| * | | | | | | | | Make it possible to compare untrusted regexps | Grzegorz Bizon | 2018-05-11 | 1 | -1/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve fast specs helper to autoload the library | Grzegorz Bizon | 2018-05-11 | 1 | -9/+3 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master' | Kamil Trzciński | 2018-05-18 | 3 | -1/+46 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow to trigger manual actions that were skipped Closes #42589 See merge request gitlab-org/gitlab-ce!18985 | ||||
| * | | | | | | | | | Add changelog entry for skipped manual actions fixfix/gb/not-allow-to-trigger-skipped-manual-actions | Grzegorz Bizon | 2018-05-16 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Do not allow to trigger manual actions that were skipped | Grzegorz Bizon | 2018-05-16 | 2 | -1/+41 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ccr/regexp_anchor' into 'master' | Kamil Trzciński | 2018-05-18 | 3 | -1/+8 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add anchor for incoming email regex, closes 44989 See merge request gitlab-org/gitlab-ce!18917 | ||||
| * | | | | | | | | | Add anchor for incoming email regex, closes 44989ccr/regexp_anchor | Chantal Rollison | 2018-05-11 | 3 | -1/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'docker-backup-restore-doc' into 'master' | Marin Jankovski | 2018-05-18 | 1 | -0/+35 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add doc about backup-restore in docker and k8s Closes gitlab-org/distribution/team-tasks#87 See merge request gitlab-org/gitlab-ce!18702 | ||||
| * | | | | | | | | | | Add doc about backup-restore in docker and k8sdocker-backup-restore-doc | Balasankar "Balu" C | 2018-05-17 | 1 | -0/+35 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '19861-expand-api-render-an-arbitrary-markdown-document' into ↵ | Douwe Maan | 2018-05-18 | 8 | -3/+184 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Expand API: Render an arbitrary Markdown document" Closes #19861 See merge request gitlab-org/gitlab-ce!18926 | ||||
| * | | | | | | | | | | | Resolve "Expand API: Render an arbitrary Markdown document" | blackst0ne | 2018-05-18 | 8 | -3/+184 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'rs-milestones-base-service-parity' into 'master' | Rémy Coutable | 2018-05-18 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring CE-EE parity to app/services/milestones/base_service.rb See merge request gitlab-org/gitlab-ce!19018 |