summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Add cached_attr_time_reader to RedisCacheableMatija Čupić2018-05-081-0/+9
* | | | | | | | | Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'Kamil Trzciński2018-05-214-3/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-userMayra Cabrera2018-05-184-3/+8
* | | | | | | | | | Merge branch 'jr-web-ide-shortcuts' into 'master'Tim Zallmann2018-05-213-0/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add web shortcut to docs and shortcut modaljr-web-ide-shortcutsJames Ramsay2018-05-183-0/+22
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rc/improve-single-script-jobs-ci-config' into 'master'Grzegorz Bizon2018-05-212-30/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Improve the single-script jobs CI configrc/improve-single-script-jobs-ci-configRémy Coutable2018-05-212-30/+31
* | | | | | | | | | | Merge branch 'trigger-cng-image' into 'master'Rémy Coutable2018-05-212-0/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use defaults for retrytrigger-cng-imageDJ Mountney2018-05-181-2/+1
| * | | | | | | | | | | Build cloud native images on tagsDJ Mountney2018-05-172-0/+80
* | | | | | | | | | | | Merge branch 'update-prometheus-ga-docs' into 'master'Marcia Ramos 🚫 (OOO - back on May 23)2018-05-212-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove experiemental notes from Prometheus docsJoshua Lambert2018-05-212-3/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'qa-247-generate-key-in-the-tests' into 'master'Grzegorz Bizon2018-05-211-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Generate the key while running the testsLin Jen-Shin2018-05-211-5/+7
* | | | | | | | | | | | | Update CHANGELOG.md for 10.7.4Filipa Lacerda2018-05-212-5/+7
* | | | | | | | | | | | | Merge branch '5845-extract-ee-environments-files' into 'master'Phil Hughes2018-05-216-220/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-filesFilipa Lacerda2018-05-18135-726/+2125
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update method nameFilipa Lacerda2018-05-172-4/+4
| * | | | | | | | | | | | | | [ci skip] Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-1747-219/+444
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-16149-2892/+1399
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Replace vue resource with axios for environmentsFilipa Lacerda2018-05-146-216/+116
* | | | | | | | | | | | | | | | | Merge branch '44799-api-naming-issue-scope' into 'master'Rémy Coutable2018-05-2111-161/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-2111-161/+129
* | | | | | | | | | | | | | | | | 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