summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Chmod 644 on offending filesdocs/fix-chmodAchilleas Pipinellis2018-05-183-0/+0
|
* Merge branch 'docs/incremental-rollouts' into 'master'Achilleas Pipinellis (🌴 May 18 - May 21 🌴)2018-05-185-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-rolloutsAchilleas Pipinellis2018-05-185-0/+52
| |
* | Merge branch 'zj-calculate-checksum-mandator' into 'master'Nick Thomas2018-05-183-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 GitalyZeger-Jan van de Weg2018-05-183-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 Coutable2018-05-183-1/+20
|\ \ \ | | | | | | | | | | | | | | | | Memoize Gitlab::Database.version See merge request gitlab-org/gitlab-ce!19021
| * | | Memoize Gitlab::Database.versionmemoize-database-versionYorick Peterse2018-05-173-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 Gray2018-05-182-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-cssDmitriy Zaporozhets2018-05-182-228/+228
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'ide-sidebar-spacing' into 'master'Filipa Lacerda2018-05-184-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-spacingPhil Hughes2018-05-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | fixed `no changes` spacing
| * | | | | fixed spacing of icon & dropdown buttonPhil Hughes2018-05-101-1/+0
| | | | | |
| * | | | | changed padding in headersPhil Hughes2018-05-091-2/+2
| | | | | |
| * | | | | fixed up spacing throughout sidebarsPhil Hughes2018-05-094-43/+56
| | | | | |
| * | | | | Fixed inconsistent spacing in web IDE sidebarPhil Hughes2018-05-091-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Closes #46162
* | | | | | Merge branch 'winh-vuex-createStore-docs' into 'master'Phil Hughes2018-05-181-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-docsWinnie Hellmann2018-05-181-2/+6
| | | | | | |
* | | | | | | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master'Kamil Trzciński2018-05-1818-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-expressionGrzegorz Bizon2018-05-181-2/+2
| | | | | | | |
| * | | | | | | Simplify untrusted regexp factory methodGrzegorz Bizon2018-05-184-21/+16
| | | | | | | |
| * | | | | | | Update variables expressions statement specsGrzegorz Bizon2018-05-171-1/+1
| | | | | | | |
| * | | | | | | Update variables expressions pattern matching docsGrzegorz Bizon2018-05-171-7/+2
| | | | | | | |
| * | | | | | | Add variables expression pattern validation supportGrzegorz Bizon2018-05-173-1/+20
| | | | | | | |
| * | | | | | | Add anti-corruption layer above expressions pattern matchingGrzegorz Bizon2018-05-172-2/+30
| | | | | | | |
| * | | | | | | Add extended /regexp/ scheme support to untrusted regexpGrzegorz Bizon2018-05-172-1/+71
| | | | | | | |
| * | | | | | | Make variables expression pattern case-sensitivity explicitGrzegorz Bizon2018-05-153-0/+22
| | | | | | | |
| * | | | | | | Add docs on pattern matching syntax in variables expressionGrzegorz Bizon2018-05-152-1/+19
| | | | | | | |
| * | | | | | | Remove useless assignment in pattern lexemeGrzegorz Bizon2018-05-151-1/+1
| | | | | | | |
| * | | | | | | Add variables expressions regexp support changelogGrzegorz Bizon2018-05-151-0/+5
| | | | | | | |
| * | | | | | | Do not support inverse variable pattern matchingGrzegorz Bizon2018-05-151-2/+1
| | | | | | | |
| * | | | | | | Use parameterized RSpec to improve variables expressions specsGrzegorz Bizon2018-05-151-43/+44
| | | | | | | |
| * | | | | | | Add support for pattern matching in variables expressionsGrzegorz Bizon2018-05-157-7/+27
| | | | | | | |
| * | | | | | | Reorganize exceptions in pipeline expressions moduleGrzegorz Bizon2018-05-158-16/+23
| | | | | | | |
| * | | | | | | Merge branch 'master' into feature/gb/add-regexp-variables-expressionGrzegorz Bizon2018-05-15163-3833/+2120
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Conflicts: lib/gitlab/untrusted_regexp.rb
| * | | | | | | | Add pattern matching variables expression lexemeGrzegorz Bizon2018-05-142-0/+86
| | | | | | | | |
| * | | | | | | | Raise variables statement exception if pattern is invalidGrzegorz Bizon2018-05-145-6/+17
| | | | | | | | |
| * | | | | | | | Do not raise if variable expression can not be evaluatedGrzegorz Bizon2018-05-142-2/+16
| | | | | | | | |
| * | | | | | | | Implement variables expression untrusted pattern lexemeGrzegorz Bizon2018-05-112-0/+81
| | | | | | | | |
| * | | | | | | | Make it possible to compare untrusted regexpsGrzegorz Bizon2018-05-111-1/+5
| | | | | | | | |
| * | | | | | | | Improve fast specs helper to autoload the libraryGrzegorz Bizon2018-05-111-9/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master'Kamil Trzciński2018-05-183-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-actionsGrzegorz Bizon2018-05-161-0/+5
| | | | | | | | | |
| * | | | | | | | | Do not allow to trigger manual actions that were skippedGrzegorz Bizon2018-05-162-1/+41
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ccr/regexp_anchor' into 'master'Kamil Trzciński2018-05-183-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_anchorChantal Rollison2018-05-113-1/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docker-backup-restore-doc' into 'master'Marin Jankovski2018-05-181-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-docBalasankar "Balu" C2018-05-171-0/+35
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '19861-expand-api-render-an-arbitrary-markdown-document' into ↵Douwe Maan2018-05-188-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"blackst0ne2018-05-188-3/+184
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs-milestones-base-service-parity' into 'master'Rémy Coutable2018-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring CE-EE parity to app/services/milestones/base_service.rb See merge request gitlab-org/gitlab-ce!19018