summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fixed comit avatar alignmentcommit-avatar-alignmentPhil Hughes2016-06-272-9/+4
* Merge branch 'image-sizing' into 'master' Rémy Coutable2016-06-273-0/+3
|\
| * Wrap images in divs with Banzai and limit max-height.image-sizingConnor Shea2016-06-273-0/+3
* | Merge branch 'case-insensitive-ci-skip' into 'master' Rémy Coutable2016-06-271-1/+1
|\ \ | |/ |/|
| * Add support for "skip ci" tooSimon Welsh2016-06-251-1/+1
| * Allow "ci skip" to be in any caseSimon Welsh2016-06-251-1/+1
* | Clean up some unused templates imported from GitLab CITakuya Noguchi2016-06-266-65/+0
* | Merge branch 'issue_19096' into 'master' Stan Hu2016-06-251-0/+7
|\ \ | |/ |/|
| * Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-241-0/+7
* | Merge branch 'issue_15588' into 'master' Jacob Schatz2016-06-243-36/+37
|\ \
| * | Add specs and improve coffescript sortable binding functionissue_15588Felipe Artur2016-06-244-40/+36
| * | Fix issue being ordered twice and callback when moving between statesFelipe Artur2016-06-243-3/+8
* | | Merge branch 'js-content-for' into 'master' Jacob Schatz2016-06-2423-23/+19
|\ \ \ | |/ / |/| |
| * | Appease Rubocop.js-content-forConnor Shea2016-06-231-1/+1
| * | Trying to make this work with sprockets in production.Connor Shea2016-06-234-10/+8
| * | Readability.Connor Shea2016-06-231-1/+1
| * | Reorganize the lib directory.Connor Shea2016-06-2319-7/+4
| * | Re-implement page-specific JS in a better way.Connor Shea2016-06-2310-16/+17
* | | Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_mer...19035-fix-merge-issueRémy Coutable2016-06-242-5/+12
* | | Merge branch 'fix/gitlab-import-project-file-fix' into 'master' Rémy Coutable2016-06-241-1/+5
|\ \ \
| * | | fix paramsJames Lopez2016-06-241-2/+2
| * | | Fix tmp file being deleted after the request plus some cleanup and improved e...James Lopez2016-06-241-1/+5
* | | | Support for rendering/redacting multiple documentsYorick Peterse2016-06-245-4/+44
|/ / /
* | | Merge branch 'hamlit-test' into 'master' Robert Speicher2016-06-231-1/+1
|\ \ \
| * | | Replace Haml with Hamlit.connorshea2016-06-221-1/+1
* | | | Merge branch 'zj-pipeline-can-be-nil'Douwe Maan2016-06-231-2/+7
|\ \ \ \
| * | | | Check if pipeline is nil before mergingzj-pipeline-can-be-nilZ.J. van de Weg2016-06-231-2/+7
* | | | | Merge branch 'fix-logo' into 'master' Jacob Schatz2016-06-231-1/+0
|\ \ \ \ \
| * | | | | Remove width restriction for logo on sign-in page.Connor Shea2016-06-231-1/+0
* | | | | | Merge branch '18438-ios-scrolling' into 'master' Jacob Schatz2016-06-237-125/+108
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix positioning of Repository sub nav scrollingAnnabel Dunstone2016-06-232-1/+20
| * | | | | Move fade divs out of every scrolling container; remove unneeded scrolling CSSAnnabel Dunstone2016-06-235-114/+61
| * | | | | Move fade out divs outside of scrolling container on project viewAnnabel Dunstone2016-06-233-19/+36
* | | | | | Merge branch '19008_ci_dropdown_label_fix' into 'master' Jacob Schatz2016-06-231-0/+4
|\ \ \ \ \ \
| * | | | | | Apply selected value as labelAlfredo Sumaran2016-06-231-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-bulk-assign' into 'master' Jacob Schatz2016-06-233-5/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use instance property to enable/disable label assignmentAlfredo Sumaran2016-06-233-12/+3
| * | | | | Disable Label update when no issues are selectedAlfredo Sumaran2016-06-231-1/+7
| * | | | | Apply labels only if we picked a label from the dropdownAlfredo Sumaran2016-06-232-4/+26
* | | | | | Merge branch '18536_status_dropdown_label' into 'master' Jacob Schatz2016-06-232-4/+11
|\ \ \ \ \ \
| * | | | | | Update dropdown text accordingly to selected item18536_status_dropdown_labelAlfredo Sumaran2016-06-171-0/+7
| * | | | | | Pass dropdown instance to toggleLabel callbackAlfredo Sumaran2016-06-171-4/+4
* | | | | | | Merge branch 'ref-dropdown-jquery-objects' into 'master' Jacob Schatz2016-06-232-12/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Updated to add parenthesesref-dropdown-jquery-objectsPhil Hughes2016-06-222-7/+7
| * | | | | | Empty the content before append anything to the dropdownPhil Hughes2016-06-221-1/+3
| * | | | | | Use jQuery objects in ref dropdownPhil Hughes2016-06-222-12/+16
* | | | | | | Merge branch 'optimize-award-emoji' into 'master' Yorick Peterse2016-06-234-12/+24
|\ \ \ \ \ \ \
| * | | | | | | Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-235-14/+26
| * | | | | | | Eager load award emoji on notesZ.J. van de Weg2016-06-232-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '18569-fix-diff-note-position' into 'master' Robert Speicher2016-06-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |