Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve the single-script jobs CI configrc/improve-single-script-jobs-ci-config | Rémy Coutable | 2018-05-21 | 2 | -30/+31 |
| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch '45065-users-projects-json-sort' into 'master' | Rémy Coutable | 2018-05-21 | 4 | -10/+17 |
|\ | | | | | | | | | | | | | UsersController#projects.json sort order Closes #45065 See merge request gitlab-org/gitlab-ce!18227 | ||||
| * | Order UsersController#projects.json by updated_at | Takuya Noguchi | 2018-05-19 | 4 | -10/+17 |
| | | |||||
* | | Merge branch 'zj-workhorse-archive-mandatory' into 'master' | Grzegorz Bizon | 2018-05-21 | 5 | -23/+9 |
|\ \ | | | | | | | | | | | | | Move git archives downloading to Gitaly See merge request gitlab-org/gitlab-ce!18990 | ||||
| * | | Move git archives downloading to Gitaly | Zeger-Jan van de Weg | 2018-05-17 | 5 | -23/+9 |
| | | | |||||
* | | | Merge branch 'fix-kube_client-proxy_url-exception' into 'master' | Grzegorz Bizon | 2018-05-21 | 4 | -0/+36 |
|\ \ \ | | | | | | | | | | | | | | | | | Rescue Kubeclient::HttpError when generating prometheus_client See merge request gitlab-org/gitlab-ce!18989 | ||||
| * | | | Remove unnecessary `with` from `allow`fix-kube_client-proxy_url-exception | Shinya Maeda | 2018-05-21 | 2 | -2/+2 |
| | | | | |||||
| * | | | Add changelog | Shinya Maeda | 2018-05-21 | 1 | -0/+5 |
| | | | | |||||
| * | | | Add spec for unathrozied proxy_url | Shinya Maeda | 2018-05-21 | 2 | -0/+26 |
| | | | | |||||
| * | | | Rescue Kubeclient::HttpError when generating prometheus_client | Shinya Maeda | 2018-05-21 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ↵ | Grzegorz Bizon | 2018-05-19 | 3 | -1/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error when deleting an empty list of refs Closes #45743 See merge request gitlab-org/gitlab-ce!19053 | ||||
| * | | | Fix error when deleting an empty list of refsxeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs | Sergey Sinev | 2018-05-18 | 3 | -1/+10 |
| | | | | | | | | | | | | | | | | Closes #45743 | ||||
* | | | | Merge branch '46498-do-not-modify-strings' into 'master' | Stan Hu | 2018-05-19 | 2 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Blob#batch can't handle frozen string paths" Closes #46498 See merge request gitlab-org/gitlab-ce!19039 | ||||
| * | | | | Fix a RuntimeError: cannot modify frozen string | Nick Thomas | 2018-05-18 | 2 | -11/+11 |
| | | | | | |||||
* | | | | | Merge branch 'docs/fix-chmod' into 'master' | Stan Hu | 2018-05-18 | 3 | -0/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Chmod 644 on offending files See merge request gitlab-org/gitlab-ce!19051 | ||||
| * | | | | Chmod 644 on offending filesdocs/fix-chmod | Achilleas Pipinellis | 2018-05-18 | 3 | -0/+0 |
| | | | | | |||||
* | | | | | Merge branch 'fix-double-brackets-in-wiki-markdown' into 'master' | Robert Speicher | 2018-05-18 | 4 | -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 markdown | Alex | 2018-05-18 | 4 | -0/+37 |
|/ / / / / | |||||
* | | | | | Merge branch 'fix/handle-large-commit-tag-message' into 'master' | Robert Speicher | 2018-05-18 | 13 | -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 messages | Ahmad Sherif | 2018-05-18 | 13 | -32/+310 |
| | | | | | | |||||
* | | | | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master' | Robert Speicher | 2018-05-18 | 4 | -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-name | Kim "BKC" Carlbäcker | 2018-05-18 | 4 | -8/+44 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'update-cicd-icon' into 'master' | Mike Greiling | 2018-05-18 | 1 | -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-icon | Joshua Lambert | 2018-05-17 | 1 | -1/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master' | Robert Speicher | 2018-05-18 | 8 | -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-auth | Rémy Coutable | 2018-05-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::Config | Rémy Coutable | 2018-05-18 | 2 | -3/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::Access | Rémy Coutable | 2018-05-18 | 2 | -11/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Minimize CE/EE difference in Gitlab::Auth::UserAuthFinders | Rémy Coutable | 2018-05-18 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Minimize CE/EE difference in Gitlab::Auth::Saml::User | Rémy Coutable | 2018-05-18 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Minimize CE/EE difference in Gitlab::Auth::Saml::Config | Rémy Coutable | 2018-05-18 | 1 | -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-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 |
| | | | | | | | | | | |