summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-scheduleDmitriy Zaporozhets2018-05-243-35/+22
* Merge branch '45065-users-projects-json-sort' into 'master'Rémy Coutable2018-05-214-10/+17
|\
| * Order UsersController#projects.json by updated_atTakuya Noguchi2018-05-194-10/+17
* | Merge branch 'zj-workhorse-archive-mandatory' into 'master'Grzegorz Bizon2018-05-215-23/+9
|\ \
| * | Move git archives downloading to GitalyZeger-Jan van de Weg2018-05-175-23/+9
* | | Merge branch 'fix-kube_client-proxy_url-exception' into 'master'Grzegorz Bizon2018-05-214-0/+36
|\ \ \
| * | | Remove unnecessary `with` from `allow`fix-kube_client-proxy_url-exceptionShinya Maeda2018-05-212-2/+2
| * | | Add changelogShinya Maeda2018-05-211-0/+5
| * | | Add spec for unathrozied proxy_urlShinya Maeda2018-05-212-0/+26
| * | | Rescue Kubeclient::HttpError when generating prometheus_clientShinya Maeda2018-05-211-0/+5
|/ / /
* | | Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ...Grzegorz Bizon2018-05-193-1/+10
|\ \ \
| * | | Fix error when deleting an empty list of refsxeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refsSergey Sinev2018-05-183-1/+10
* | | | Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-192-11/+11
|\ \ \ \
| * | | | Fix a RuntimeError: cannot modify frozen stringNick Thomas2018-05-182-11/+11
* | | | | Merge branch 'docs/fix-chmod' into 'master'Stan Hu2018-05-183-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 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 messagesAhmad Sherif2018-05-1813-32/+310
* | | | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master'Robert Speicher2018-05-184-8/+44
|\ \ \ \ \ \
| * | | | | | 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 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::User5913-extract-ee-specific-lines-for-lib-gitlab-authRémy Coutable2018-05-181-2/+3
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::ConfigRémy Coutable2018-05-182-3/+51
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::AccessRémy Coutable2018-05-182-11/+43
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::UserAuthFindersRémy Coutable2018-05-181-4/+6
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::Saml::UserRémy Coutable2018-05-181-4/+2
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::Saml::ConfigRémy Coutable2018-05-181-0/+4
* | | | | | | Merge branch 'docs/incremental-rollouts' into 'master'Achilleas Pipinellis (🌴 May 18 - May 21 🌴)2018-05-185-0/+52
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 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 GitalyZeger-Jan van de Weg2018-05-183-86/+35
* | | | | | | | Merge branch 'memoize-database-version' into 'master'Rémy Coutable2018-05-183-1/+20
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Memoize Gitlab::Database.versionmemoize-database-versionYorick Peterse2018-05-173-1/+20
* | | | | | | | 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.scssdz-refactor-lists-cssDmitriy Zaporozhets2018-05-182-228/+228
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'ide-sidebar-spacing' into 'master'Filipa Lacerda2018-05-184-45/+63
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed up spacing above & below listside-sidebar-spacingPhil Hughes2018-05-171-1/+8
| * | | | | | | | 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
* | | | | | | | | Merge branch 'winh-vuex-createStore-docs' into 'master'Phil Hughes2018-05-181-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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