summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove stray conflict markerdm-changelog-viewerDouwe Maan2017-05-171-1/+0
* Merge branch 'master' into 'dm-changelog-viewer'Douwe Maan2017-05-1723-211/+466
|\
| * Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-172-2/+17
| |\
| | * Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-152-2/+17
| * | Merge branch 'dm-contributing-viewer' into 'master' Rémy Coutable2017-05-174-1/+37
| |\ \
| | * | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-164-1/+37
| * | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' Filipa Lacerda2017-05-175-11/+62
| |\ \ \
| | * | | Address MR comments.acet-mr-widget-nothing-to-commit-stateFatih Acet2017-05-161-1/+0
| | * | | MRWidget: Fix specs and address WIP comments.Fatih Acet2017-05-162-7/+6
| | * | | Returns new_blob_path only when user can push_code to projectOswaldo Ferreira2017-05-161-3/+5
| | * | | MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-165-11/+62
| * | | | Merge branch 'dm-scroll-to-blob-user-content' into 'master' Douwe Maan2017-05-171-0/+1
| |\ \ \ \
| | * | | | Scroll to anchor when blob content is loadeddm-scroll-to-blob-user-contentDouwe Maan2017-05-161-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'update-admin-health-page' into 'master' Filipa Lacerda2017-05-171-14/+5
| |\ \ \ \
| | * | | | Removed old endpoints from the monitoring viewupdate-admin-health-pageJose Ivan Vargas2017-05-161-17/+2
| | * | | | update admin health page with the application readiness endpointsJose Ivan Vargas2017-05-161-0/+6
| * | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' in...Tim Zallmann2017-05-175-80/+107
| |\ \ \ \ \
| | * | | | | Clean up UI and styles.Bryce Johnson2017-05-155-80/+107
| * | | | | | Fix deletion of issue assignees for MySQLsh-fix-delete-assignees-mysqlStan Hu2017-05-161-4/+9
| * | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-164-99/+228
| |\ \ \ \ \ \
| | * | | | | | Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-164-99/+228
| * | | | | | | Merge branch 'fix_assignee_yourick_approach' into 'master' Douwe Maan2017-05-161-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Improve migration for Multipple issue assignee featureValery Sizov2017-05-161-2/+2
| | | |_|/ / / | | |/| | | |
* | | | | | | Add auxiliary viewer for CHANGELOGDouwe Maan2017-05-165-2/+26
|/ / / / / /
* | | | | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-1613-66/+74
|\ \ \ \ \ \
| * | | | | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to m...dm-blob-viewer-concernsDouwe Maan2017-05-156-18/+26
| * | | | | | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-138-46/+46
| * | | | | | Allow blob viewer to support multiple filetypesDouwe Maan2017-05-134-7/+7
* | | | | | | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Fatih Acet2017-05-161-1/+2
|\ \ \ \ \ \ \
| * | | | | | | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-151-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '32326-scrollable-tabs-overflow' into 'master' Annabel Dunstone Gray2017-05-162-2/+6
|\ \ \ \ \ \ \
| * | | | | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-168-241/+258
|/ / / / / /
* | | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-163-0/+20
|\ \ \ \ \ \
| * | | | | | Add test.js and test.css to disable animations during testing and include the...disable-css-and-jquery-animations-for-capybaraLuke "Jared" Bennett2017-05-153-0/+20
* | | | | | | Removes nicescroll from issuable sidebarPhil Hughes2017-05-163-13/+9
* | | | | | | Only renders empty state for pipelines table if no pipelines are received whe...Filipa Lacerda2017-05-162-16/+36
* | | | | | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-161-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tabJose Ivan Vargas2017-05-151-1/+0
* | | | | | | | Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-167-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-167-11/+11
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '31386-profile-fix-externallinks' into 'master' Douwe Maan2017-05-162-2/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed Regex(es)Tim Zallmann2017-05-111-2/+2
| * | | | | | | | Fixing Static Analysis Fail with IndentationTim Zallmann2017-05-081-2/+1
| * | | | | | | | Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-082-2/+21
| * | | | | | | | Doing the commit again with the correct E-Mail address setupTim Zallmann2017-05-081-2/+2
| * | | | | | | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-05-081-2/+2
* | | | | | | | | Rename Personal Audit LogTim Zallmann2017-05-164-5/+6
* | | | | | | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' Fatih Acet2017-05-162-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-132-1/+5
View Lorry Controller Status