summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'engwan/gitlab-ce-44012-filter-reactions-none-any'Sean McGivern2018-11-014-12/+59
|\
| * Fix testsHeinrich Lee Yu2018-11-012-23/+10
| * Add None / Any options to search barHeinrich Lee Yu2018-11-012-0/+18
| * Add None / Any options to reaction filter in issues / MRs APIHeinrich Lee Yu2018-11-012-10/+52
* | Merge branch '52382-filter-milestone-api-none-any' into 'master'Sean McGivern2018-11-012-18/+20
|\ \
| * | Rearrange code for readabilityHeinrich Lee Yu2018-11-011-16/+18
| * | Update search bar token for None and AnyHeinrich Lee Yu2018-11-011-2/+2
| * | Update API to accept None and AnyHeinrich Lee Yu2018-11-011-13/+13
| |/
* | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-0131-38/+38
|\ \
| * | Fix typos in comments and specsGeorge Tsiolis2018-11-0131-38/+38
* | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-011-1/+1
|\ \ \ | |_|/ |/| |
| * | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-301-1/+1
* | | Merge branch 'da-rubocop-whitelist-active-record-none' into 'master'Yorick Peterse2018-10-3112-28/+0
|\ \ \
| * | | Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-3112-28/+0
* | | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3162-1593/+1797
|\ \ \ \
| * | | | Fix eslint violationsMike Greiling2018-10-311-1/+1
| * | | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3162-1592/+1796
* | | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master'Mike Greiling2018-10-313-3/+3
|\ \ \ \ \
| * | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-313-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-314-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix quick links button stylesGeorge Tsiolis2018-10-294-5/+5
* | | | | Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'Grzegorz Bizon2018-10-311-4/+12
|\ \ \ \ \
| * | | | | Send continue parameter on for cancel_pathSteve Azzopardi2018-10-311-4/+12
| | |_|/ / | |/| | |
* | | | | Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-313-5/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-263-5/+9
* | | | | Merge branch 'gl-ui-pagination' into 'master'Phil Hughes2018-10-312-2/+4
|\ \ \ \ \
| * | | | | Remove gitlab-ui's pagination from globalgl-ui-paginationClement Ho2018-10-302-2/+4
| | |/ / / | |/| | |
* | | | | Remove gitlab-ui's modal from globalClement Ho2018-10-313-8/+13
* | | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master'Phil Hughes2018-10-314-7/+7
|\ \ \ \ \
| * | | | | Fix typos in IDE propsGeorge Tsiolis2018-10-304-7/+7
| | |_|_|/ | |/| | |
* | | | | Adds required prop to the post merge pipeline53386-broken-masterFilipa Lacerda2018-10-311-0/+1
* | | | | Merge branch '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-s...Filipa Lacerda2018-10-314-2/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix rspec error text regexMatija Čupić2018-10-241-1/+2
| * | | | Regenerates pot filesFilipa Lacerda2018-10-241-3/+2
| * | | | Updates CI/CD documentation link in MR widgetFilipa Lacerda2018-10-243-3/+18
| * | | | Fix the troubleshooting docs linkMatija Čupić2018-10-243-4/+3
| * | | | Add docs linkMatija Čupić2018-10-243-1/+4
| * | | | Change CI status error messageMatija Čupić2018-10-241-1/+1
* | | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-3013-22/+49
|\ \ \ \ \
| * | | | | Centralize loading blob data before highlightingMark Chao2018-10-301-0/+2
| * | | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-302-7/+14
| * | | | | Move :plain option to Highlight classMark Chao2018-10-304-9/+2
| * | | | | Make Highlight accept language paramMark Chao2018-10-3010-15/+17
| * | | | | Add BlobPresenter for highlightingMark Chao2018-10-302-1/+17
| * | | | | Add access to Blob's language from gitattributesMark Chao2018-10-301-0/+7
* | | | | | Fix application layout form descriptionAndreas Kämmerle2018-10-301-2/+2
* | | | | | Resolve "Create new group: Rename form fields and update UI"Martin Wortschack2018-10-303-40/+50
* | | | | | Merge branch 'sh-fix-search-relative-urls' into 'master'Clement Ho2018-10-301-2/+2
|\ \ \ \ \ \
| * | | | | | Fix search "all in GitLab" not working with relative URLssh-fix-search-relative-urlsStan Hu2018-10-281-2/+2
* | | | | | | Merge branch 'fl-missing-i18n' into 'master'Mike Greiling2018-10-305-15/+18
|\ \ \ \ \ \ \
View Lorry Controller Status