summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-userMayra Cabrera2018-05-184-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was using name, instead of username. Fixes documentation as well Closes #46454
* | | | | | | | | | Merge branch 'jr-web-ide-shortcuts' into 'master'Tim Zallmann2018-05-213-0/+22
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add web shortcut to docs and shortcut modal Closes #46385 See merge request gitlab-org/gitlab-ce!19044
| * | | | | | | | | | 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 config See merge request gitlab-org/gitlab-ce!19040
| * | | | | | | | | | Improve the single-script jobs CI configrc/improve-single-script-jobs-ci-configRémy Coutable2018-05-212-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'trigger-cng-image' into 'master'Rémy Coutable2018-05-212-0/+79
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build cloud native images on tags See merge request gitlab-org/gitlab-ce!19025
| * | | | | | | | | | | Use defaults for retrytrigger-cng-imageDJ Mountney2018-05-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use a supported syntax for ignoring docs during gem install
| * | | | | | | | | | | Build cloud native images on tagsDJ Mountney2018-05-172-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When on a tag, trigger a multi-project pipeline in the CNG repostiory. Opting for a trigger rather than an addition to our release-tools project for a few reasons: - The Dockerfiles in the CNG image repo change infrequently, and as a result I don't feel the need/overhead for stable branches in that repo at this time - My intent with the CNG repo, is that once stable, the Dockerfiles would actualy move to their component projects, to be versioned with the code they are building - It is likely that we will want to followup with a manually triggered package for branches for devs, and possibly review apps, so it made sense to build the CNG ci jobs to accept this sort of pipeline.
* | | | | | | | | | | | 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 docs See merge request gitlab-org/gitlab-ce!19056
| * | | | | | | | | | | | 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 tests Closes gitlab-qa#247 See merge request gitlab-org/gitlab-ce!19059
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch '5845-extract-ee-environments-files' into 'master'Phil Hughes2018-05-216-220/+120
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces vue resource with axios for environments code See merge request gitlab-org/gitlab-ce!18950
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-filesFilipa Lacerda2018-05-18135-726/+2125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (69 commits) Calculating repository checksums executed by Gitaly Resolve "Expand API: Render an arbitrary Markdown document" Update EE > CE downgrade service removal steps Make stores export a createStore() which can be used in tests Simplify pattern lexeme fabrication and matcher Simplify untrusted regexp factory method Fix api_json.log not always reporting the right HTTP status code Move group lists css from framework/lists.scss to pages/groups.scss Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar" Add Keyboard shortcuts for "Kubernetes" and "Environments" Move API group deletion to Sidekiq fix typos. add a reference to deliverable and stretch for design artifact fix / assigne username wrapping problem has been fixed Memoize Gitlab::Database.version Conditionally add Gitaly deprecation warnings based on ENV variable Bring CE-EE parity to app/services/milestones/base_service.rb Bring CE-EE parity to app/services/lfs/unlock_file_service.rb Fixes 500 error on /estimate BIG_VALUE Fix: Use case in-sensitive ordering by name for groups Fix group lists visual ...
| * | | | | | | | | | | | | | Update method nameFilipa Lacerda2018-05-172-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | [ci skip] Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-1747-219/+444
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (24 commits) Remove unneccessary imports fixed copy to cliboard button in embedded snippets Fix Error 500 viewing admin page due to statement timeouts Workhorse to send raw diff and patch for commits Refactor out duplication in runner_policy.rb Remove unnecessary runner.is_shared? checks in api because they are handled by policy Allow admin to assign shared runner to project through API Change policy list_runner_jobs -> read_runner Rename User#ci_authorized_runners -> ci_owned_runners Improve efficiency of authorized_runner policy query Use can? policies for lib/api/runners.rb Allow group runners to be viewed/edited in API Whitelisted query limits for group destroy API Fixed typo Changed order of include Use find_in_batches instead of destroy_all Delete remote uploads Use correct base width Refactor duplicate code Add changelog entry for contrib graphs width fix ...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 5845-extract-ee-environments-filesFilipa Lacerda2018-05-16149-2892/+1399
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (79 commits) Project Sidebar: Split CI/CD into CI/CD and Operations Fix GPM content types for Doorkeeper Remove docker pull prefix from registry clipboard feature Remove unnecessary section-100 css class from application_row.vue Document the 3h timeout for GitLab.com shared Runners edit GitLab license info in regards to CC licensing Fix bug with long strings in issue boards Fix setting Gitlab metrics content types Add documentation for bulk editing of issues and merge requests Remove authentication for readonly endpoints in issues API Remote table-section from div holding cluster error messages Improve testing best practices guidelines Add a unique and not null constraint on the project_features.project_id column fix typos Frontend Guide, development_process.md Disable greedy mode when matching filename Add index on runner_type for ci_runners Improve the squash step in the 'Database Changes' MR template Update docs describing `fast_spec_helper` best practices Display help text below auto devops domain with nip.io domain name (#45561) Enable update_(build|pipeline) for maintainers ...
| * | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935
| * | | | | | | | | | | | | | | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-2111-161/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate corresponding dash versions created-by-me and assigned-to-me
* | | | | | | | | | | | | | | | | Merge branch '45065-users-projects-json-sort' into 'master'Rémy Coutable2018-05-214-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UsersController#projects.json sort order Closes #45065 See merge request gitlab-org/gitlab-ce!18227
| * | | | | | | | | | | | | | | | 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 Gitaly See merge request gitlab-org/gitlab-ce!18990
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-refsSergey Sinev2018-05-183-1/+10
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #45743
* | | | | | | | | | | | | | | | | Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-192-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 stringNick Thomas2018-05-182-11/+11
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | 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>