summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Just save the size in total rather than individual filesLin Jen-Shin2016-06-281-20/+6
* Introduce ci_builds.artifacts_sizes as JSON:Lin Jen-Shin2016-06-281-1/+20
* Merge remote-tracking branch 'dev/master'Robert Speicher2016-06-275-7/+17
|\
| * Merge branch 'fix-18997' into 'master' Robert Speicher2016-06-271-1/+10
| |\
| | * Fix visibility of private project snippets for members when searchingDouglas Barbosa Alexandre2016-06-221-4/+10
| | * Fix internal snippets can be searched by anyoneDouglas Barbosa Alexandre2016-06-221-1/+4
| * | Merge branch '19102-fix' into 'master' Robert Speicher2016-06-274-6/+7
| |\ \
| | * | Fix an information disclosure when requesting access to a group containing pr...Rémy Coutable2016-06-244-6/+7
* | | | Merge branch 'issue_18398' into 'master' Douwe Maan2016-06-271-0/+11
|\ \ \ \
| * | | | Check for conflict with wiki projects when creating a new project.issue_18398Ruben Davila2016-06-271-0/+11
* | | | | Merge branch 'cherry-pick-5734e266' into 'master' Robert Speicher2016-06-271-1/+8
|\ \ \ \ \
| * | | | | Fix rendering of commit notesDouwe Maan2016-06-271-1/+8
* | | | | | Merge branch 'emoji-menu-stick-search' into 'master' Jacob Schatz2016-06-273-14/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Made the search bar on emoji menu stickyPhil Hughes2016-06-203-14/+15
* | | | | | Merge branch 'mark-done-todo-id' into 'master' Robert Speicher2016-06-271-1/+2
|\ \ \ \ \ \
| * | | | | | Correctly returns todo ID after creating todomark-done-todo-idPhil Hughes2016-06-271-1/+2
* | | | | | | Merge branch '19075-new-wiki' into 'master' Fatih Acet2016-06-271-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Add conditional for new pag linkAnnabel Dunstone2016-06-271-0/+4
| * | | | | | | Remove duplicate new page btn from edit wikiAnnabel Dunstone2016-06-271-3/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'new-branch-check-fix' into 'master' Fatih Acet2016-06-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix check for existence of new branch button (!4630)winniehell2016-06-271-1/+1
| |/ / / / /
* | | | | | Merge branch 'revert-sri' into 'master' Jacob Schatz2016-06-272-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Revert Subresource Integrity pending a fix for Firefox's incorrect hashing im...revert-sriConnor Shea2016-06-272-4/+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
|\ \ \ \ \ \