summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fixed form action not submitting the correct URLph-inline-jsPhil Hughes2017-07-281-1/+6
* Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-2855-134/+737
|\
| * Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-273-78/+90
| |\
| | * Remove deprecated `repository_storage` attributebvl-add-all-settings-to-apiBob Van Landuyt2017-07-271-0/+2
| | * Make the attribute list for application settings reusableBob Van Landuyt2017-07-272-78/+88
| * | Merge branch 'ch-test-removal' into 'master'Jacob Schatz2017-07-271-1/+0
| |\ \
| | * | Test remove potentially unused filech-test-removalClement Ho2017-07-261-1/+0
| * | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-275-7/+29
| |\ \ \
| | * | | Encapsulate the commit.sha logicHiroyuki Sato2017-07-272-2/+6
| | * | | Use simplified routeHiroyuki Sato2017-07-271-1/+1
| | * | | Refactor: use keyword arguments for optional parametersHiroyuki Sato2017-07-232-2/+2
| | * | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-232338-36135/+68643
| | |\ \ \
| | * | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-085-7/+25
| * | | | | Merge branch 'remove_blob_by_oid' into 'master'Robert Speicher2017-07-271-4/+0
| |\ \ \ \ \
| | * | | | | Removed `Repository#blob_by_oid` unused methodremove_blob_by_oidAndrew Newdigate2017-07-261-4/+0
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-274-1/+17
| |\ \ \ \ \
| | * | | | | Use params#require instead params[] accessOswaldo Ferreira2017-07-271-1/+1
| | * | | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-274-1/+17
| * | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into 'm...Sean McGivern2017-07-272-8/+8
| |\ \ \ \ \ \
| | * | | | | | Changed Images in Blob Viewer to image_tag35577-fix-image-blob-display-due-to-lazy-image-loadingTim Zallmann2017-07-272-8/+8
| | * | | | | | Added lazy class to Blob Images + DiffsTim Zallmann2017-07-272-8/+8
| | |/ / / / /
| * | | | | | add "GPG Keys" to new navigationAlexis Reigel2017-07-271-0/+4
| * | | | | | remove log statements from workersAlexis Reigel2017-07-272-9/+3
| * | | | | | improve gpg key validationAlexis Reigel2017-07-271-2/+3
| * | | | | | validate the foreign_key instead of the relationAlexis Reigel2017-07-271-1/+1
| * | | | | | update all records at once using `update_all`Alexis Reigel2017-07-271-6/+5
| * | | | | | simplify nil handlingAlexis Reigel2017-07-271-2/+1
| * | | | | | extract setter as before_actionAlexis Reigel2017-07-271-4/+8
| * | | | | | upcase in the model instead of in the viewAlexis Reigel2017-07-274-2/+14
| * | | | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-279-14/+71
| * | | | | | use db's on_delete instead of has_many :dependentAlexis Reigel2017-07-272-2/+2
| * | | | | | use ShaAttribute for gpg table columnsAlexis Reigel2017-07-274-2/+12
| * | | | | | nicer email badges on the profile gpg pageAlexis Reigel2017-07-274-13/+32
| * | | | | | display gpg key in the popover with monospace fontAlexis Reigel2017-07-271-1/+2
| * | | | | | swap user's name and the user's usernameAlexis Reigel2017-07-271-2/+2
| * | | | | | show gpg key's user info when no profile existsAlexis Reigel2017-07-271-6/+18
| * | | | | | store gpg user name and email on the signatureAlexis Reigel2017-07-271-5/+11
| * | | | | | unify commit signature colors with pipeline statusAlexis Reigel2017-07-273-24/+31
| * | | | | | user may now revoke a gpg keyAlexis Reigel2017-07-273-2/+27
| * | | | | | use lighter gray for unverified gpg signatureAlexis Reigel2017-07-271-3/+3
| * | | | | | use svg icons for gpg popoversAlexis Reigel2017-07-273-5/+21
| * | | | | | add notfound icon (question mark)Alexis Reigel2017-07-271-0/+1
| * | | | | | don't use assignment in if conditionAlexis Reigel2017-07-271-4/+6
| * | | | | | generate gpg signature on pushAlexis Reigel2017-07-272-0/+28
| * | | | | | improve spacing / alignments in gpg popupAlexis Reigel2017-07-274-29/+20
| * | | | | | use existing status-box css class for gpg badgeAlexis Reigel2017-07-274-15/+17
| * | | | | | use the correct flex classes on the commits listAlexis Reigel2017-07-272-3/+3
| * | | | | | simplify fetching of commitAlexis Reigel2017-07-271-0/+4
| * | | | | | convert gpg badge helper methods to partialsAlexis Reigel2017-07-276-87/+48
| * | | | | | use after_commit instead of AfterCommitQueueAlexis Reigel2017-07-272-12/+5
View Lorry Controller Status