Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bvl-add-all-settings-to-api' into 'master' | Robert Speicher | 2017-07-27 | 3 | -78/+90 |
|\ | |||||
| * | Remove deprecated `repository_storage` attributebvl-add-all-settings-to-api | Bob Van Landuyt | 2017-07-27 | 1 | -0/+2 |
| * | Make the attribute list for application settings reusable | Bob Van Landuyt | 2017-07-27 | 2 | -78/+88 |
* | | Merge branch 'ch-test-removal' into 'master' | Jacob Schatz | 2017-07-27 | 1 | -1/+0 |
|\ \ | |||||
| * | | Test remove potentially unused filech-test-removal | Clement Ho | 2017-07-26 | 1 | -1/+0 |
* | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 5 | -7/+29 |
|\ \ \ | |||||
| * | | | Encapsulate the commit.sha logic | Hiroyuki Sato | 2017-07-27 | 2 | -2/+6 |
| * | | | Use simplified route | Hiroyuki Sato | 2017-07-27 | 1 | -1/+1 |
| * | | | Refactor: use keyword arguments for optional parameters | Hiroyuki Sato | 2017-07-23 | 2 | -2/+2 |
| * | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wiki | Hiroyuki Sato | 2017-07-23 | 2338 | -36135/+68643 |
| |\ \ \ | |||||
| * | | | | Prevent concurrent editing wiki | Hiroyuki Sato | 2017-03-08 | 5 | -7/+25 |
* | | | | | Merge branch 'remove_blob_by_oid' into 'master' | Robert Speicher | 2017-07-27 | 1 | -4/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Removed `Repository#blob_by_oid` unused methodremove_blob_by_oid | Andrew Newdigate | 2017-07-26 | 1 | -4/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'backport-ee-2456' into 'master' | Robert Speicher | 2017-07-27 | 4 | -1/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Use params#require instead params[] access | Oswaldo Ferreira | 2017-07-27 | 1 | -1/+1 |
| * | | | | | Backport gitlab-ee!2456 | Oswaldo Ferreira | 2017-07-27 | 4 | -1/+17 |
* | | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into 'm... | Sean McGivern | 2017-07-27 | 2 | -8/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changed Images in Blob Viewer to image_tag35577-fix-image-blob-display-due-to-lazy-image-loading | Tim Zallmann | 2017-07-27 | 2 | -8/+8 |
| * | | | | | | Added lazy class to Blob Images + Diffs | Tim Zallmann | 2017-07-27 | 2 | -8/+8 |
| |/ / / / / | |||||
* | | | | | | add "GPG Keys" to new navigation | Alexis Reigel | 2017-07-27 | 1 | -0/+4 |
* | | | | | | remove log statements from workers | Alexis Reigel | 2017-07-27 | 2 | -9/+3 |
* | | | | | | improve gpg key validation | Alexis Reigel | 2017-07-27 | 1 | -2/+3 |
* | | | | | | validate the foreign_key instead of the relation | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
* | | | | | | update all records at once using `update_all` | Alexis Reigel | 2017-07-27 | 1 | -6/+5 |
* | | | | | | simplify nil handling | Alexis Reigel | 2017-07-27 | 1 | -2/+1 |
* | | | | | | extract setter as before_action | Alexis Reigel | 2017-07-27 | 1 | -4/+8 |
* | | | | | | upcase in the model instead of in the view | Alexis Reigel | 2017-07-27 | 4 | -2/+14 |
* | | | | | | fetch gpg signature badges by ajax | Alexis Reigel | 2017-07-27 | 9 | -14/+71 |
* | | | | | | use db's on_delete instead of has_many :dependent | Alexis Reigel | 2017-07-27 | 2 | -2/+2 |
* | | | | | | use ShaAttribute for gpg table columns | Alexis Reigel | 2017-07-27 | 4 | -2/+12 |
* | | | | | | nicer email badges on the profile gpg page | Alexis Reigel | 2017-07-27 | 4 | -13/+32 |
* | | | | | | display gpg key in the popover with monospace font | Alexis Reigel | 2017-07-27 | 1 | -1/+2 |
* | | | | | | swap user's name and the user's username | Alexis Reigel | 2017-07-27 | 1 | -2/+2 |
* | | | | | | show gpg key's user info when no profile exists | Alexis Reigel | 2017-07-27 | 1 | -6/+18 |
* | | | | | | store gpg user name and email on the signature | Alexis Reigel | 2017-07-27 | 1 | -5/+11 |
* | | | | | | unify commit signature colors with pipeline status | Alexis Reigel | 2017-07-27 | 3 | -24/+31 |
* | | | | | | user may now revoke a gpg key | Alexis Reigel | 2017-07-27 | 3 | -2/+27 |
* | | | | | | use lighter gray for unverified gpg signature | Alexis Reigel | 2017-07-27 | 1 | -3/+3 |
* | | | | | | use svg icons for gpg popovers | Alexis Reigel | 2017-07-27 | 3 | -5/+21 |
* | | | | | | add notfound icon (question mark) | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
* | | | | | | don't use assignment in if condition | Alexis Reigel | 2017-07-27 | 1 | -4/+6 |
* | | | | | | generate gpg signature on push | Alexis Reigel | 2017-07-27 | 2 | -0/+28 |
* | | | | | | improve spacing / alignments in gpg popup | Alexis Reigel | 2017-07-27 | 4 | -29/+20 |
* | | | | | | use existing status-box css class for gpg badge | Alexis Reigel | 2017-07-27 | 4 | -15/+17 |
* | | | | | | use the correct flex classes on the commits list | Alexis Reigel | 2017-07-27 | 2 | -3/+3 |
* | | | | | | simplify fetching of commit | Alexis Reigel | 2017-07-27 | 1 | -0/+4 |
* | | | | | | convert gpg badge helper methods to partials | Alexis Reigel | 2017-07-27 | 6 | -87/+48 |
* | | | | | | use after_commit instead of AfterCommitQueue | Alexis Reigel | 2017-07-27 | 2 | -12/+5 |
* | | | | | | validate presence of user on gpg_key | Alexis Reigel | 2017-07-27 | 1 | -0/+2 |
* | | | | | | use hash instead of 2d array | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |