Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca... | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
* | fix merge miss | Shinya Maeda | 2017-07-28 | 1 | -0/+4 |
* | init | Shinya Maeda | 2017-07-28 | 3 | -4/+15 |
* | Merge branch '32483-jira-error' into 'master' | Sean McGivern | 2017-07-28 | 1 | -7/+24 |
|\ | |||||
| * | Display specific error message when JIRA test fails32483-jira-error | Jarka Kadlecova | 2017-07-27 | 1 | -7/+24 |
* | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 1 | -0/+36 |
|\ \ | |||||
| * | | Encapsulate the commit.sha logic | Hiroyuki Sato | 2017-07-27 | 1 | -4/+26 |
| * | | Refactor: use keyword arguments for optional parameters | Hiroyuki Sato | 2017-07-23 | 1 | -2/+2 |
| * | | Change double quotes to single quotes | Hiroyuki Sato | 2017-07-23 | 1 | -7/+7 |
| * | | Merge branch 'master' into 1827-prevent-concurrent-editing-wiki | Hiroyuki Sato | 2017-07-23 | 159 | -3961/+10710 |
| |\ \ | |||||
| * | | | Prevent concurrent editing wiki | Hiroyuki Sato | 2017-03-08 | 1 | -0/+14 |
* | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 3 | -0/+205 |
|\ \ \ \ | |||||
| * | | | | improve gpg key validation | Alexis Reigel | 2017-07-27 | 1 | -1/+9 |
| * | | | | validate the foreign_key instead of the relation | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| * | | | | simplify nil handling | Alexis Reigel | 2017-07-27 | 1 | -0/+4 |
| * | | | | store gpg user name and email on the signature | Alexis Reigel | 2017-07-27 | 1 | -3/+23 |
| * | | | | user may now revoke a gpg key | Alexis Reigel | 2017-07-27 | 1 | -0/+27 |
| * | | | | simplify fetching of commit | Alexis Reigel | 2017-07-27 | 1 | -0/+13 |
| * | | | | validate presence of user on gpg_key | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| * | | | | use hash instead of 2d array | Alexis Reigel | 2017-07-27 | 1 | -4/+4 |
| * | | | | remove the :gpg rspec tag | Alexis Reigel | 2017-07-27 | 1 | -3/+3 |
| * | | | | update invalid gpg signatures when email changes | Alexis Reigel | 2017-07-27 | 1 | -0/+20 |
| * | | | | store gpg_key_primary_keyid for unknown gpg keys | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| * | | | | move signature cache read to Gpg::Commit | Alexis Reigel | 2017-07-27 | 1 | -82/+0 |
| * | | | | gpg signature is only valid when key is verified | Alexis Reigel | 2017-07-27 | 1 | -0/+16 |
| * | | | | cache the gpg commit signature | Alexis Reigel | 2017-07-27 | 1 | -23/+65 |
| * | | | | gpg signature model for gpg verification caching | Alexis Reigel | 2017-07-27 | 1 | -0/+14 |
| * | | | | verify gpg commit using tmp keyring and db query | Alexis Reigel | 2017-07-27 | 1 | -2/+2 |
| * | | | | add primary keyid attribute to gpg keys | Alexis Reigel | 2017-07-27 | 1 | -0/+8 |
| * | | | | don't sync to keychain file | Alexis Reigel | 2017-07-27 | 2 | -107/+8 |
| * | | | | remove gpg from keychain when user's email changes | Alexis Reigel | 2017-07-27 | 2 | -24/+76 |
| * | | | | notification email on add new gpg key | Alexis Reigel | 2017-07-27 | 1 | -0/+14 |
| * | | | | gpg email verification | Alexis Reigel | 2017-07-27 | 1 | -3/+42 |
| * | | | | move current keychain methods to namespace | Alexis Reigel | 2017-07-27 | 1 | -3/+5 |
| * | | | | test with a gpg key with multiple emails | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
| * | | | | use example gpg key instead of my own | Alexis Reigel | 2017-07-27 | 1 | -4/+4 |
| * | | | | add second gpg key for specs | Alexis Reigel | 2017-07-27 | 2 | -7/+7 |
| * | | | | add / remove gpg keys to / from system keychain | Alexis Reigel | 2017-07-27 | 1 | -3/+21 |
| * | | | | only validate gpg_key#fingerprint "internally" | Alexis Reigel | 2017-07-27 | 1 | -2/+0 |
| * | | | | add emails method to GgpKey | Alexis Reigel | 2017-07-27 | 1 | -0/+8 |
| * | | | | add gpg key model | Alexis Reigel | 2017-07-27 | 1 | -0/+41 |
| * | | | | commit signature with spec | Alexis Reigel | 2017-07-27 | 1 | -0/+40 |
* | | | | | Use described_class when possible | Rémy Coutable | 2017-07-27 | 37 | -172/+172 |
* | | | | | Remove superfluous lib: true, type: redis, service: true, models: true, servi... | Rémy Coutable | 2017-07-27 | 117 | -119/+119 |
* | | | | | Remove superfluous type defs in specs | Keifer Furzland | 2017-07-27 | 42 | -49/+49 |
|/ / / / | |||||
* | | | | Fix saving diffs that are not valid UTF-835539-can-t-create-a-merge-request-containing-a-binary-file-with-non-utf-8-characters | Sean McGivern | 2017-07-26 | 2 | -1/+35 |
* | | | | Fix project wiki web_url spec | Michael Kozono | 2017-07-26 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'zj-repo-exists-gitaly' into 'master' | Sean McGivern | 2017-07-26 | 1 | -6/+10 |
|\ \ \ | |||||
| * | | | Implement GRPC call to RepositoryService | Z.J. van de Weg | 2017-07-26 | 1 | -6/+10 |
| | |/ | |/| | |||||
* | | | Merge branch '31129-jira-project-key-elim' into 'master' | Sean McGivern | 2017-07-26 | 1 | -7/+3 |
|\ \ \ |