Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master' | Rémy Coutable | 2017-08-02 | 1 | -0/+30 |
|\ | | | | | | | | | Uniquify reserved word usernames on OAuth user creation See merge request !13244 | ||||
| * | Uniquify reserved word usernames on OAuth user creation | Robin Bobbitt | 2017-08-02 | 1 | -0/+30 |
| | | |||||
* | | Merge branch 'rs-empty_project-cleanup' into 'master' | Rémy Coutable | 2017-08-02 | 23 | -56/+56 |
|\ \ | | | | | | | | | | | | | Ensure all project factories use `:repository` trait or `:empty_project` See merge request !13238 | ||||
| * | | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup | Robert Speicher | 2017-08-01 | 23 | -56/+56 |
| | | | |||||
* | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into ↵ | Douwe Maan | 2017-08-02 | 2 | -15/+6 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | 'master' Add kube_namespace and standardize common variables for additional metrics queries See merge request !13169 | ||||
| * | | Tests for query context variables | Pawel Chojnacki | 2017-07-31 | 1 | -1/+1 |
| | | | |||||
| * | | Context handling and tests cleanup + simple test kube_namespace context test | Pawel Chojnacki | 2017-07-31 | 2 | -15/+6 |
| | | | |||||
* | | | Merge branch 'blob-limit-test' into 'master' | Sean McGivern | 2017-08-01 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix bug in blob test See merge request !13224 | ||||
| * | | | Fix bug in blob test | Jacob Vosmaer | 2017-08-01 | 1 | -2/+8 |
| | | | | |||||
* | | | | Merge branch '28283-legacy-storage-format' into 'master' | Sean McGivern | 2017-08-01 | 23 | -67/+91 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149 | ||||
| * | | | | Rename more path_with_namespace -> full_path or disk_path | Gabriel Mazetto | 2017-08-01 | 3 | -8/+8 |
| | | | | | |||||
| * | | | | Rename path_with_namespace -> disk_path when dealing with the filesystem | Gabriel Mazetto | 2017-08-01 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 18 | -57/+81 |
| | | | | | |||||
* | | | | | Merge branch 'gitaly-commit-languages' into 'master' | Sean McGivern | 2017-08-01 | 1 | -0/+39 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Add option to use Gitaly CommitLanguages RPC See merge request !13084 | ||||
| * | | | | Add option to use CommitLanguages RPC | Jacob Vosmaer | 2017-08-01 | 1 | -0/+39 |
| | | | | | |||||
* | | | | | Merge branch 'remove-content-commit' into 'master' | Douwe Maan | 2017-08-01 | 1 | -8/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Remove unused Gitlab::Diff code See merge request !13195 | ||||
| * | | | | Remove unused (?) code | Jacob Vosmaer | 2017-07-31 | 1 | -8/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'mk-fix-wiki-backup' into 'master' | Douwe Maan | 2017-07-31 | 1 | -0/+54 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix improperly skipped backups of wikis Closes #28854 See merge request !13096 | ||||
| * | | | | Fix Rubocop offensemk-fix-wiki-backup | Michael Kozono | 2017-07-28 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Protect backups from stale cache for repo exists | Michael Kozono | 2017-07-28 | 1 | -0/+54 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master' | Kamil Trzciński | 2017-07-31 | 3 | -31/+47 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Improve deploy environment chatops slash command Closes #34748 See merge request !13150 | ||||
| * | | | Improve wording related to deploy chatops commandfix/gb/fix-chatops-deploy-multiple-actions-matching | Grzegorz Bizon | 2017-07-28 | 3 | -5/+5 |
| | | | | |||||
| * | | | Improve deploy environment chatops slash command | Grzegorz Bizon | 2017-07-28 | 2 | -30/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now match deployment actions better. If there is more than one deployment action matched, we check if there is an action which name equals to environment name, instead of raising an error about too many actions defined. | ||||
* | | | | Fixes #29385: Add /shrug and /tableflip commands | Alex Ives | 2017-07-28 | 3 | -1/+94 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated DSL to support substitution definitions - Added substitution definition, inherits from command definition - Added tabelflip and shrug substitutions to interpret service - Added support for substitution definitions to the extractor for preview mode. - Added substitution handling in the interpret service Signed-off-by: Alex Ives <alex@ives.mn> | ||||
* | | | Merge branch 'merge-issuable-reopened-into-opened-state' into 'master' | Sean McGivern | 2017-07-28 | 1 | -9/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | Merge issuable "reopened" state into "opened" See merge request !12972 | ||||
| * | | Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-state | Yorick Peterse | 2017-07-28 | 1 | -9/+1 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL. | ||||
* | | init | Shinya Maeda | 2017-07-28 | 1 | -0/+3 |
|/ | |||||
* | Incorporate RefsService.FindAllBranches Gitaly RPCgitaly-all-branches | Alejandro Rodríguez | 2017-07-27 | 2 | -2/+18 |
| | |||||
* | Improve Gitlab::Git::Repository specs for #branches | Alejandro Rodríguez | 2017-07-27 | 1 | -14/+39 |
| | |||||
* | Remove unused Gitlab::Git operations | Alejandro Rodríguez | 2017-07-27 | 1 | -138/+0 |
| | |||||
* | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitaly | Ahmad Sherif | 2017-07-27 | 1 | -14/+24 |
| | | | | Closes gitaly#411 | ||||
* | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 3 | -0/+383 |
|\ | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546 | ||||
| * | optimize query, only select relevant db columns | Alexis Reigel | 2017-07-27 | 1 | -11/+53 |
| | | |||||
| * | store gpg user name and email on the signature | Alexis Reigel | 2017-07-27 | 2 | -6/+14 |
| | | |||||
| * | extract common method | Alexis Reigel | 2017-07-27 | 1 | -8/+21 |
| | | |||||
| * | also update gpg_signatures when gpg_key is null | Alexis Reigel | 2017-07-27 | 1 | -15/+55 |
| | | |||||
| * | simplify fetching of commit | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | |||||
| * | remove the :gpg rspec tag | Alexis Reigel | 2017-07-27 | 1 | -2/+8 |
| | | | | | | | | | | since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore. | ||||
| * | extract variable | Alexis Reigel | 2017-07-27 | 1 | -6/+7 |
| | | |||||
| * | need to wrap the raw commit in a commit model | Alexis Reigel | 2017-07-27 | 1 | -2/+7 |
| | | |||||
| * | update invalid gpg signatures when email changes | Alexis Reigel | 2017-07-27 | 1 | -25/+61 |
| | | |||||
| * | update invalid gpg signatures when key is created | Alexis Reigel | 2017-07-27 | 1 | -0/+50 |
| | | |||||
| * | memoize verified_signature call | Alexis Reigel | 2017-07-27 | 1 | -6/+6 |
| | | |||||
| * | store gpg_key_primary_keyid for unknown gpg keys | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | | | | we need to store the keyid to be able to update the signature later in case the missing key is added later. | ||||
| * | move signature cache read to Gpg::Commit | Alexis Reigel | 2017-07-27 | 1 | -12/+49 |
| | | | | | | | | | | | | | | | | as we write the cache in the gpg commit class already the read should also happen there. This also removes all logic from the main commit class, which just proxies the call to the Gpg::Commit now. | ||||
| * | gpg signature is only valid when key is verified | Alexis Reigel | 2017-07-27 | 1 | -2/+26 |
| | | |||||
| * | bail if the commit has no signature | Alexis Reigel | 2017-07-27 | 1 | -0/+6 |
| | | |||||
| * | cache the gpg commit signature | Alexis Reigel | 2017-07-27 | 1 | -0/+53 |
| | | | | | | | | | | we store the result of the gpg commit verification in the db because the gpg verification is an expensive operation. | ||||
| * | verify gpg commit using tmp keyring and db query | Alexis Reigel | 2017-07-27 | 1 | -0/+17 |
| | | |||||
| * | add primary keyid attribute to gpg keys | Alexis Reigel | 2017-07-27 | 1 | -0/+14 |
| | |