summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* fixed mutations specPhil Hughes2018-05-252-2/+9
* fixed pipeline actions specPhil Hughes2018-05-251-0/+1
* refactored to use data we already havePhil Hughes2018-05-2511-174/+69
* Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-2521-66/+219
|\
| * Merge branch '46768-typo-on-the-empty-pipelines-page' into 'master'Filipa Lacerda2018-05-251-1/+1
| |\
| | * Fix typo in Pipelines empty state viewMark Fletcher2018-05-251-1/+1
| * | Resolve "Show CI pipeline status in Web IDE"André Luís2018-05-259-29/+150
| * | Merge branch 'dz-refactor-cluster-apps-schedule' into 'master'Douwe Maan2018-05-242-17/+7
| |\ \
| | * | Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-scheduleDmitriy Zaporozhets2018-05-242-17/+7
| * | | Updated branches and tag icons in commit detailsConstance Okoghenun2018-05-242-3/+4
| * | | Merge branch 'ce-6127-move-merge-requests-services' into 'master'Rémy Coutable2018-05-241-2/+6
| |\ \ \
| | * | | Extract a do_execute method to be overriddence-6127-move-merge-requests-servicesLin Jen-Shin2018-05-241-2/+6
| * | | | Merge branch 'issue_38418' into 'master'Rémy Coutable2018-05-243-9/+37
| |\ \ \ \
| | * | | | Fix sidebar issue countissue_38418Felipe Artur2018-05-243-9/+37
| * | | | | Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-241-2/+2
| |\ \ \ \ \
| | * | | | | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-211-2/+2
| * | | | | | Merge branch 'fl-loading-icon' into 'master'Phil Hughes2018-05-242-3/+12
| |\ \ \ \ \ \
| | * | | | | | Show loading icon only when making the requestfl-loading-iconFilipa Lacerda2018-05-232-3/+12
| | | |_|/ / / | | |/| | | |
* | | | | | | removed hacky $forceUpdatePhil Hughes2018-05-251-5/+0
* | | | | | | spec fixesPhil Hughes2018-05-242-2/+6
* | | | | | | removed need for jobs componentPhil Hughes2018-05-244-71/+54
* | | | | | | improve design of job itemsPhil Hughes2018-05-248-23/+137
* | | | | | | added job item componentPhil Hughes2018-05-242-9/+31
* | | | | | | style improvementsPhil Hughes2018-05-2411-57/+163
* | | | | | | improve API calls by calling internal API to get dataPhil Hughes2018-05-248-56/+137
* | | | | | | added tab componentPhil Hughes2018-05-2413-16/+214
* | | | | | | Added right sidebar componentsPhil Hughes2018-05-243-0/+113
|/ / / / / /
* | | | | | Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-2410-24/+122
|\ \ \ \ \ \
| * | | | | | Avoid race condition of re-triggering mark_as_uncheckedMark Chao2018-05-181-2/+2
| * | | | | | Plural reason(s)Mark Chao2018-05-183-5/+5
| * | | | | | Create TODO when MR became unmergeablelulalala2018-05-173-19/+18
| * | | | | | Notify with email when merge request became unmergeablelulalala2018-05-177-0/+82
| * | | | | | Add MergeRequest#merge_participantslulalala2018-05-171-0/+10
| * | | | | | Add cannot_be_merged_recheck merge_statuslulalala2018-05-172-5/+11
| * | | | | | Update doclulalala2018-05-171-0/+1
* | | | | | | Merge branch 'jprovazn-fix-resolvable' into 'master'Douwe Maan2018-05-241-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Check if note's noteable is not nil when checking resolvabilityjprovazn-fix-resolvableJan Provaznik2018-05-231-1/+1
* | | | | | | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling2018-05-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Closes MR check out branch modal with escapeJacopo2018-05-221-1/+1
* | | | | | | | Merge branch '39710-search-placeholder-cut-off' into 'master'Annabel Gray2018-05-236-29/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes: Runners search input placeholder is cut offJacopo2018-05-236-29/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'ldap-u2f-fix' into 'master'Mike Greiling2018-05-231-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed U2F authentication when used with LDAPPhil Hughes2018-05-231-0/+3
* | | | | | | | | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-235-47/+61
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu...Rémy Coutable2018-05-231-1/+1
| * | | | | | | | | Use the new CacheableAttributes concern in the ApplicationSetting and Appeara...Rémy Coutable2018-05-233-46/+6
| * | | | | | | | | Introduce a new CacheableAttributes concernRémy Coutable2018-05-231-0/+54
* | | | | | | | | | Merge branch 'fix/devops-remove-beta' into 'master'Tim Zallmann2018-05-234-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | removed "(Beta)" from "Auto DevOps" messagesfix/devops-remove-betaPaul Slaughter2018-05-214-4/+4
* | | | | | | | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-1/+1
| |/ / / / / / / / |/| | | | | | | |