Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-schedule | Dmitriy Zaporozhets | 2018-05-24 | 1 | -18/+15 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch '45065-users-projects-json-sort' into 'master' | Rémy Coutable | 2018-05-21 | 2 | -9/+11 |
|\ | | | | | | | | | | | | | 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 | 2 | -9/+11 |
| | | |||||
* | | Merge branch 'zj-workhorse-archive-mandatory' into 'master' | Grzegorz Bizon | 2018-05-21 | 2 | -15/+1 |
|\ \ | | | | | | | | | | | | | 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 | 2 | -15/+1 |
| | | | |||||
* | | | Remove unnecessary `with` from `allow`fix-kube_client-proxy_url-exception | Shinya Maeda | 2018-05-21 | 2 | -2/+2 |
| | | | |||||
* | | | Add spec for unathrozied proxy_url | Shinya Maeda | 2018-05-21 | 2 | -0/+26 |
| | | | |||||
* | | | Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ↵ | Grzegorz Bizon | 2018-05-19 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | '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 | 1 | -0/+4 |
| | | | | | | | | | | | | Closes #45743 | ||||
* | | | Fix double brackets being linkified in wiki markdown | Alex | 2018-05-18 | 2 | -0/+29 |
| | | | |||||
* | | | Merge branch 'fix/handle-large-commit-tag-message' into 'master' | Robert Speicher | 2018-05-18 | 4 | -4/+119 |
|\ \ \ | | | | | | | | | | | | | | | | | 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 | 4 | -4/+119 |
| | | | | |||||
* | | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master' | Robert Speicher | 2018-05-18 | 1 | -2/+12 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+12 |
| | | | | | |||||
* | | | | | Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master' | Robert Speicher | 2018-05-18 | 3 | -4/+50 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | [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 | 1 | -1/+35 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::Access | Rémy Coutable | 2018-05-18 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Merge branch 'zj-calculate-checksum-mandator' into 'master' | Nick Thomas | 2018-05-18 | 1 | -48/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -48/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+14 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Memoize Gitlab::Database.version See merge request gitlab-org/gitlab-ce!19021 | ||||
| * | | | | | Memoize Gitlab::Database.versionmemoize-database-version | Yorick Peterse | 2018-05-17 | 1 | -0/+14 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | This removes the need for running a database query every time we want to check the database version. | ||||
* | | | | | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master' | Kamil Trzciński | 2018-05-18 | 9 | -48/+296 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for variables expression regexp syntax Closes #43601 See merge request gitlab-org/gitlab-ce!18902 | ||||
| * | | | | | Simplify untrusted regexp factory method | Grzegorz Bizon | 2018-05-18 | 3 | -12/+10 |
| | | | | | | |||||
| * | | | | | Update variables expressions statement specs | Grzegorz Bizon | 2018-05-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add variables expression pattern validation support | Grzegorz Bizon | 2018-05-17 | 2 | -1/+16 |
| | | | | | | |||||
| * | | | | | Add anti-corruption layer above expressions pattern matching | Grzegorz Bizon | 2018-05-17 | 1 | -0/+28 |
| | | | | | | |||||
| * | | | | | Add extended /regexp/ scheme support to untrusted regexp | Grzegorz Bizon | 2018-05-17 | 1 | -1/+48 |
| | | | | | | |||||
| * | | | | | Make variables expression pattern case-sensitivity explicit | Grzegorz Bizon | 2018-05-15 | 2 | -0/+14 |
| | | | | | | |||||
| * | | | | | Use parameterized RSpec to improve variables expressions specs | Grzegorz Bizon | 2018-05-15 | 1 | -43/+44 |
| | | | | | | |||||
| * | | | | | Add support for pattern matching in variables expressions | Grzegorz Bizon | 2018-05-15 | 3 | -4/+18 |
| | | | | | | |||||
| * | | | | | Reorganize exceptions in pipeline expressions module | Grzegorz Bizon | 2018-05-15 | 3 | -7/+7 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into feature/gb/add-regexp-variables-expression | Grzegorz Bizon | 2018-05-15 | 38 | -362/+1140 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Conflicts: lib/gitlab/untrusted_regexp.rb | ||||
| * | | | | | | Add pattern matching variables expression lexeme | Grzegorz Bizon | 2018-05-14 | 1 | -0/+57 |
| | | | | | | | |||||
| * | | | | | | Raise variables statement exception if pattern is invalid | Grzegorz Bizon | 2018-05-14 | 3 | -4/+11 |
| | | | | | | | |||||
| * | | | | | | Do not raise if variable expression can not be evaluated | Grzegorz Bizon | 2018-05-14 | 1 | -2/+14 |
| | | | | | | | |||||
| * | | | | | | Implement variables expression untrusted pattern lexeme | Grzegorz Bizon | 2018-05-11 | 1 | -0/+55 |
| | | | | | | | |||||
| * | | | | | | Improve fast specs helper to autoload the library | Grzegorz Bizon | 2018-05-11 | 1 | -9/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix/gb/not-allow-to-trigger-skipped-manual-actions' into 'master' | Kamil Trzciński | 2018-05-18 | 1 | -0/+40 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow to trigger manual actions that were skipped Closes #42589 See merge request gitlab-org/gitlab-ce!18985 | ||||
| * | | | | | | | Do not allow to trigger manual actions that were skipped | Grzegorz Bizon | 2018-05-16 | 1 | -0/+40 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ccr/regexp_anchor' into 'master' | Kamil Trzciński | 2018-05-18 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add anchor for incoming email regex, closes 44989 See merge request gitlab-org/gitlab-ce!18917 | ||||
| * | | | | | | | Add anchor for incoming email regex, closes 44989ccr/regexp_anchor | Chantal Rollison | 2018-05-11 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | Resolve "Expand API: Render an arbitrary Markdown document" | blackst0ne | 2018-05-18 | 1 | -0/+112 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Add Keyboard shortcuts for "Kubernetes" and "Environments" | Lukas Eipert | 2018-05-18 | 1 | -1/+40 |
| | | | | | | | |||||
* | | | | | | | Move API group deletion to Sidekiq | Stan Hu | 2018-05-18 | 2 | -6/+11 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch '46193-fix-big-estimate' into 'master' | Rémy Coutable | 2018-05-17 | 1 | -0/+13 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Estimating a large amount results in a server error 500" Closes #46193 See merge request gitlab-org/gitlab-ce!18964 | ||||
| * | | | | | | Fixes 500 error on /estimate BIG_VALUE | Jacopo | 2018-05-17 | 1 | -0/+13 |
| | | | | | | | |||||
* | | | | | | | Merge branch '46381-dropdown-mr-widget' into 'master' | Annabel Gray | 2018-05-17 | 2 | -47/+51 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Dropdown actions in mini pipeline graph in mr widget don't work" Closes #46381 See merge request gitlab-org/gitlab-ce!18976 | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into 46381-dropdown-mr-widget46381-dropdown-mr-widget | Filipa Lacerda | 2018-05-17 | 22 | -192/+380 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (40 commits) Add changelog Update quick_start_guide.md Resolve "Opening Project with invite but without accepting leads to 404 error page" Respect the inheritance chain between Ci::Build and CommitStatus Remove unneccessary imports fixed copy to cliboard button in embedded snippets Fix Error 500 viewing admin page due to statement timeouts Grant privileges after database is created Only setup db in the first checkout! Project Sidebar: Split CI/CD into CI/CD and Operations Fix GPM content types for Doorkeeper 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 ... | ||||
| * | | | | | | | | Reloads pipeline table when dropdown action is clicked and closes the ↵ | Filipa Lacerda | 2018-05-16 | 2 | -36/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdown in the MR widget |