summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* simplify and reorganize webpack config45532-upgrade-vue-loaderMike Greiling2018-05-181-98/+88
|
* move devtool setting into main config objectMike Greiling2018-05-181-3/+2
|
* upgrade to vue-loader 15.0.11 and update webpack configMike Greiling2018-05-183-92/+66
|
* Merge branch 'docs/fix-chmod' into 'master'Stan Hu2018-05-183-0/+0
|\ | | | | | | | | Chmod 644 on offending files See merge request gitlab-org/gitlab-ce!19051
| * Chmod 644 on offending filesdocs/fix-chmodAchilleas Pipinellis2018-05-183-0/+0
| |
* | Merge branch 'fix-double-brackets-in-wiki-markdown' into 'master'Robert Speicher2018-05-184-0/+37
|\ \ | | | | | | | | | | | | Fix double brackets being linkified in wiki markdown See merge request gitlab-org/gitlab-ce!18524
| * | Fix double brackets being linkified in wiki markdownAlex2018-05-184-0/+37
|/ /
* | Merge branch 'fix/handle-large-commit-tag-message' into 'master'Robert Speicher2018-05-1813-32/+310
|\ \ | | | | | | | | | | | | Add handling for commit/tags with big messages See merge request gitlab-org/gitlab-ce!17892
| * | Add handling for commit/tags with big messagesAhmad Sherif2018-05-1813-32/+310
| | |
* | | Merge branch 'gitaly-1182-search-by-content-name' into 'master'Robert Speicher2018-05-184-8/+44
|\ \ \ | | | | | | | | | | | | | | | | Migrate Repo#search_by_{content,name} to Gitaly See merge request gitlab-org/gitlab-ce!18750
| * | | Migrate RepositoryService#SearchFilesBy{Content,Name}gitaly-1182-search-by-content-nameKim "BKC" Carlbäcker2018-05-184-8/+44
| | | |
* | | | Merge branch 'update-cicd-icon' into 'master'Mike Greiling2018-05-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI/CD icon to be the rocket Closes #46491 See merge request gitlab-org/gitlab-ce!19024
| * | | | Update CICD to use rocket iconupdate-cicd-iconJoshua Lambert2018-05-171-1/+1
| | | | |
* | | | | Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master'Robert Speicher2018-05-188-24/+109
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for lib/gitlab/auth" See merge request gitlab-org/gitlab-ce!19037
| * | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::User5913-extract-ee-specific-lines-for-lib-gitlab-authRémy Coutable2018-05-181-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::ConfigRémy Coutable2018-05-182-3/+51
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::AccessRémy Coutable2018-05-182-11/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Minimize CE/EE difference in Gitlab::Auth::UserAuthFindersRémy Coutable2018-05-181-4/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Minimize CE/EE difference in Gitlab::Auth::Saml::UserRémy Coutable2018-05-181-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Minimize CE/EE difference in Gitlab::Auth::Saml::ConfigRémy Coutable2018-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | 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
| | | | | | | | | |
View Lorry Controller Status