summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2832-91/+144
|\
| * Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-272-0/+8
| |\
| | * Encapsulate the commit.sha logicHiroyuki Sato2017-07-271-1/+1
| | * Use simplified routeHiroyuki Sato2017-07-271-1/+1
| | * Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23387-3417/+3646
| | |\
| | * | Prevent concurrent editing wikiHiroyuki Sato2017-03-082-0/+8
| * | | 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
| * | | | upcase in the model instead of in the viewAlexis Reigel2017-07-271-1/+1
| * | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-274-3/+11
| * | | | use ShaAttribute for gpg table columnsAlexis Reigel2017-07-271-1/+1
| * | | | 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
| * | | | use svg icons for gpg popoversAlexis Reigel2017-07-272-2/+4
| * | | | improve spacing / alignments in gpg popupAlexis Reigel2017-07-273-11/+12
| * | | | use existing status-box css class for gpg badgeAlexis Reigel2017-07-273-8/+8
| * | | | use the correct flex classes on the commits listAlexis Reigel2017-07-272-3/+3
| * | | | convert gpg badge helper methods to partialsAlexis Reigel2017-07-274-1/+47
| * | | | position gpg badge first on commit lineAlexis Reigel2017-07-271-1/+1
| * | | | add gpg commit popover badgesAlexis Reigel2017-07-271-3/+1
| * | | | cache the gpg commit signatureAlexis Reigel2017-07-271-3/+3
| * | | | Prototype key verificationKevin O'Connor2017-07-273-0/+6
| |/ / /
| * | | Merge branch '35191-prioritized-labels-for-non-member' into 'master'Rémy Coutable2017-07-271-5/+8
| |\ \ \
| | * | | Remove help message about prioritized labels for non-membersTakuya Noguchi2017-07-271-5/+8
| | | |/ | | |/|
| * | | Inline JS Removal for Merge RequestsTim Zallmann2017-07-273-25/+6
| * | | change Fogbugz button to FogBugzBen Bodenmiller2017-07-261-1/+1
| * | | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-264-10/+16
| |\ \ \
| | * | | Move exception handling to executeTiago Botelho2017-07-264-11/+9
| | * | | Add specs for ProjectDestroyWorkerTiago Botelho2017-07-204-11/+9
| | * | | WIP: Display a project's `delete_error` on the project homepage.Timothy Andrew2017-07-202-0/+10
| * | | | Merge branch '35163-url-in-commit-message-can-be-broken-in-blame' into 'master'Phil Hughes2017-07-251-2/+2
| |\ \ \ \
| | * | | | Use only CSS to truncate commit message in blameTakuya Noguchi2017-07-251-2/+2
| * | | | | Resolve "Lazy load images on the Frontend"Tim Zallmann2017-07-242-8/+8
| * | | | | How to Merge to external FileTim Zallmann2017-07-241-11/+3
| * | | | | Merge branch '35391-fix-star-i18n-in-js' into 'master'Filipa Lacerda2017-07-241-1/+1
| |\ \ \ \ \
| | * | | | | Fix translations for Star/Unstar in JS file35391-fix-star-i18n-in-jsRémy Coutable2017-07-211-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'Filipa Lacerda2017-07-241-3/+3
| |\ \ \ \ \
| | * | | | | Fixed duplicate new milestone buttons in new navigationnew-nav-duplicated-new-milestone-buttonsPhil Hughes2017-07-241-3/+3
| | |/ / / /
| * | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-241-1/+1
| |/ / / /
| * | | | Merge branch '31031-convert-protected-branches-es6' into 'master'Filipa Lacerda2017-07-213-3/+5
| |\ \ \ \
| | * | | | Add class to use in JS and testskushalpandya2017-07-192-2/+2
| | * | | | Add class to use in JS and test, add flash error containerkushalpandya2017-07-191-1/+3
| * | | | | Merge branch 'fix/sm/32790-pipeline_schedules-pages-throwing-error-500' into ...Grzegorz Bizon2017-07-211-1/+1
| |\ \ \ \ \
| | * | | | | Add present?Shinya Maeda2017-07-201-1/+1
| * | | | | | Merge branch '20817-please-add-coordinator-url-to-admin-area-runner-page' int...Grzegorz Bizon2017-07-201-16/+3
| |\ \ \ \ \ \
| | * | | | | | Add an id for the tag(#registration_token). Wrap long lines.Shinya Maeda2017-07-201-1/+3
| | * | | | | | Add coordinator url to admin area runner pageShinya Maeda2017-07-201-16/+1
| | |/ / / / /
* | | | | | | Remove temp_tokenLuke "Jared" Bennett2017-07-281-1/+1